MrDoomBringer
4d206f56e8
Adds ~70 more suicides
2018-01-23 01:39:07 -06:00
oranges
1f7e25be0a
Merge pull request #34413 from kevinz000/patch-430
...
Allows C4 on mobs again
2018-01-16 14:28:17 -06:00
ShizCalev
80095fea0a
Replaces cached get_area vars for names ( #34338 )
2018-01-13 20:56:11 -06:00
oranges
e164b0cf25
Merge pull request #33699 from QualityVan/safedestruction
...
Makes vault safe slightly less explosion-proof
2018-01-13 04:17:27 -06:00
deathride58
d8facb3bce
initial commit - game folder + maps + dme
2018-01-03 22:52:38 -05: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
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08: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
deathride58
b6630b41d1
merges #3877 proper
2017-11-22 17:37:22 -05:00
LetterJay
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
LetterJay
636e2a6d90
Update grenade.dm
2017-10-30 17:32:08 -05:00
Ashe Higgs
0c4c4dc1f2
You can now hide grenades in plushies
2017-10-30 14:34:01 -05:00
Jordan Brown
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
CitadelStationBot
d25cb1ba5d
[MIRROR] Grammar fixes to atom descriptions ( #3165 )
...
* Grammar fixes to atom descriptions
* compile errors
2017-10-21 07:17:03 -05:00
AnturK
2ecb4c216c
Datum rev & related upgrades to base datum antag
2017-10-18 02:26:11 -05:00
Emmett Gaines
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
LetterJay
d6903bcf3c
Merge branch 'master' into upstream-merge-31601
2017-10-14 10:17:16 -04:00
LetterJay
6e10c020ec
Update syndieminibomb.dm
2017-10-13 10:26:07 -05:00
Jordan Brown
bd7a0d65b5
Fix many instances of "the the"
2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
ShizCalev
4fe003af83
Fixes plastic explosive issues ( #31549 )
2017-10-12 12:38:08 -05:00
kevinz000
2456a2a289
Update plastic.dm ( #31441 )
2017-10-09 14:26:40 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
LetterJay
a960b63b0a
Merge branch 'master' into upstream-merge-30056
2017-09-13 06:08:59 -05:00
LetterJay
c2a41c9b51
commit
2017-09-13 06:04:22 -05:00
LetterJay
24a7aa5a9f
Merge branch 'master' into upstream-merge-30079
2017-09-06 09:24:23 -05:00
kevinz000
f70fd6a980
Merge pull request #2536
2017-08-29 22:39:54 -07:00
kevinz000
408acdd66d
sync
2017-08-29 22:05:16 -07:00
kevinz000
5591afc9ce
double wew
2017-08-29 09:53:11 -07:00
CitadelStationBot
54c68decde
Fixes clowns blowing shit up not being logged 50% of the time
2017-08-29 09:32:06 -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
