oranges
6dfb1e2351
Merge pull request #34206 from ShizCalev/fireaxe-drop
...
Fixes twohanded weapons not unwielding when you lose an arm.
2018-01-11 14:02:42 -06:00
Goodstuff
bc543c5220
Update twohanded.dm ( #34139 )
2018-01-10 03:51:23 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05:00
LetterJay
a3ebaa5de8
Merge branch 'master' into upstream-merge-32311
2017-12-29 18:38:50 -06:00
oranges
269208f687
[READY]Component Forensics and Item Blood OverlayS!
2017-12-27 15:19:14 -06:00
LetterJay
2e6b034493
save point - a lot of shit to fix
2017-12-27 07:03:40 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
kevinz000
8149f52777
Adds jousting ( #33531 )
2017-12-18 20:54:21 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
vuonojenmustaturska
fcceb5ec77
Finishes the forceMove port
2017-12-14 15:40:08 -06:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
ShizCalev
47e0943c9c
Fixes twohanded weapons showing outdated icons ( #33127 )
2017-11-28 19:04:09 -06:00
AutomaticFrenzy
cb7d45c980
actually use disable_warning mob_can_equip ( #32750 )
2017-11-15 19:07:01 -06:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
oranges
1068b8f22d
Merge pull request #32456 from vuonojenmustaturska/ghostmemes
...
[s] Removes a handful of ways ghosts can affect the world
2017-11-06 21:48:42 -06:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
kingofkosmos
f0c684c15e
Alt-clicking descriptions when examining
2017-09-28 21:51:53 -05:00
CitadelStationBot
b4c27d5533
[MIRROR] Chainsaws now have a suicide! ( #2734 )
...
* Chainsaws now have a suicide! (#30559 )
* i have the power !!
thanks, cobby!
* help my code is growing out of control
i'm not even touching the keyboard anymore
* do you like.... my car
* nobody saw that, compile BEFORE you commit kids
* LITERALLY THE BEST COMMIT OF ALL TIME
THANKS AGAIN COBBY FOR FIXING IT UP
* FINISHING PR
ICING ON CAKE
* LET THERE BE SOUND!
* mokay then
* really should have gotten around to this
yep
* Chainsaws now have a suicide!
2017-09-13 22:53:55 -05:00
Armhulen
0dfe72d77e
chainsaws rebalance, but working this time :)
2017-09-08 10:00:47 -05:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00