Merge branch 'thokking-hell' into 'next' (091a8745) · Commits · Rem / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

091a8745

Commit 091a8745 authored 1 year ago by Logan Aerl Arias

Downloads
- Plain Diff

Merge branch 'thokking-hell' into 'next'

New CA_THOK effect

See merge request STJr/SRB2!1551

parents 7c13f6e9 d0cb7707

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/deh_tables.c 4 additions, 2 deletions

src/deh_tables.c
src/g_demo.c 25 additions, 0 deletions

src/g_demo.c
src/hardware/hw_light.c 1 addition, 0 deletions

src/hardware/hw_light.c
src/info.c 31 additions, 2 deletions

src/info.c
src/info.h 6 additions, 3 deletions

src/info.h
src/p_user.c 13 additions, 1 deletion

src/p_user.c

with 80 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment