Commit Graph
4745 Commits
Author SHA1 Message Date
LetterJayandGitHub bc2b6b01c1 Update target_stake.dm 2017-10-07 22:50:50 -05:00
LetterJayandGitHub a7ac93dd2b Update structures.dm 2017-10-07 22:50:38 -05:00
LetterJayandGitHub 6332ae6004 Update paiwire.dm 2017-10-07 22:50:21 -05:00
LetterJayandGitHub 62d2b26c7a Update handcuffs.dm 2017-10-07 22:49:52 -05:00
LetterJayandGitHub eabe7f67f5 Update constructable_frame.dm 2017-10-07 22:49:19 -05:00
LetterJayandGitHub 68fa18f489 Update PDApainter.dm 2017-10-07 22:48:55 -05:00
LetterJayandGitHub 12506ade24 Update cough.dm 2017-10-07 22:48:23 -05:00
LetterJayandGitHub 661c2d293b Update client_procs.dm 2017-10-07 22:45:04 -05:00
LetterJayandGitHub 398455917d Merge pull request #3204 from Citadel-Station-13/upstream-merge-31372
[MIRROR] Fixes cool threads grammar issue
2017-10-07 23:44:25 -04:00
LetterJayandGitHub 04846a2f66 Merge pull request #3203 from Citadel-Station-13/upstream-merge-31376
[MIRROR] Nightmare spawn event
2017-10-07 23:44:06 -04:00
LetterJayandGitHub f95ba7dfaa Merge pull request #3202 from Citadel-Station-13/upstream-merge-31378
[MIRROR] Lets cyborgs use ladders
2017-10-07 23:43:50 -04:00
LetterJayandGitHub 662a7d55cd Merge pull request #3201 from Citadel-Station-13/upstream-merge-31383
[MIRROR] Fixes grammar on zippos
2017-10-07 23:43:35 -04:00
LetterJayandGitHub 4cc8703a93 Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375
[MIRROR] Fixes clockcult runtime
2017-10-07 23:42:57 -04:00
LetterJayandGitHub 21f5d993d8 Merge pull request #3197 from Citadel-Station-13/upstream-merge-31337
[MIRROR] Nerfs shotgun darts
2017-10-07 23:42:36 -04:00
LetterJayandGitHub 8fdf275b26 Merge pull request #3193 from Citadel-Station-13/upstream-merge-31309
[MIRROR] Config option to automatically call the shuttle for high casualties
2017-10-07 23:42:17 -04:00
ShizCalevandCitadelStationBot 92ec5c11ab Fixes being able to sell camera mobs to CentCom (#31306)
* Fixes being able to sell camera mobs to CENTCOM

* Did it Ninja's way.
2017-10-07 19:13:28 -05:00
bawhoppenandCitadelStationBot 0ad78d0c44 frown emoji (#31393) 2017-10-07 19:11:17 -05:00
RobustinandCitadelStationBot 98a34c2211 Virus Neuter Fix (#31392) 2017-10-07 18:01:57 -05:00
Neriandkevinz000 4bc4ab7fc5 Oh. That's what was missing. (#3143)
Boop.
2017-10-07 14:01:43 -07:00
Jordan BrownandCitadelStationBot 4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
Kyle Spier-SwensonandCitadelStationBot 988dd75850 Allows editing config.allow_admin_ooccolor 2017-10-07 12:38:17 -05:00
Jordan BrownandCitadelStationBot 075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Jordan BrownandCitadelStationBot 91aa560f0d High pop reduced MC processing mode. 2017-10-07 08:42:43 -05:00
Jordan BrownandCitadelStationBot 20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings
Fixes cool threads grammar issue
2017-10-07 08:42:36 -05:00
KorPhaeronandCitadelStationBot 39728cc9b3 Nightmare spawn event (#31376)
* Nightmare Event

* Update nightmare.dm

* Standards
2017-10-07 08:41:25 -05:00
kevinz000andCitadelStationBot 13aa6f8650 Lets cyborgs use ladders (#31378) 2017-10-07 08:40:15 -05:00
Jordan BrownandCitadelStationBot a8c4a155a5 Merge pull request #31383 from BeeSting12/youlights
Fixes grammar on zippos
2017-10-07 08:38:04 -05:00
AnturKandCitadelStationBot 84490f919e Fixes clockcult runtime 2017-10-07 07:46:52 -05:00
jughuandCitadelStationBot 466a6806e1 Allows shotgun darts to cause reagent reactions (#31337) 2017-10-07 00:18:04 -05:00
LetterJayandGitHub 0c6be827a2 Merge pull request #3195 from Citadel-Station-13/upstream-merge-31364
[MIRROR] Fixes Wood Being Invisible.
2017-10-07 01:08:18 -04:00
LetterJayandGitHub 233388a345 Merge pull request #3194 from Citadel-Station-13/upstream-merge-31347
[MIRROR] Makes put_in_hands use drop_location()
2017-10-07 01:08:10 -04:00
LetterJayandGitHub 5a65cdc939 Merge branch 'master' into upstream-merge-31309 2017-10-07 01:07:59 -04:00
LetterJayandGitHub 03bd841ac3 Merge pull request #3191 from Citadel-Station-13/upstream-merge-31344
[MIRROR] Lightgeists are gold core spawnable
2017-10-07 01:07:03 -04:00
LetterJayandGitHub 7e547fa2cd Merge pull request #3189 from Citadel-Station-13/upstream-merge-31359
[MIRROR] Adds Wumborian Fugu to the gold core spawn
2017-10-07 01:06:46 -04:00
LetterJayandGitHub bc91ec435f Merge pull request #3188 from Citadel-Station-13/upstream-merge-31357
[MIRROR] Resolving tickets now informs the player.
2017-10-07 01:06:16 -04:00
LetterJayandGitHub 5988122386 Merge branch 'master' into upstream-merge-31397 2017-10-07 01:05:58 -04:00
LetterJayandGitHub dc6d97a69a Merge pull request #3186 from Citadel-Station-13/upstream-merge-31362
[MIRROR] Fixes deconstructive analyzer infinite material exploit
2017-10-07 01:05:33 -04:00
LetterJayandGitHub fe27aa586c Merge pull request #3181 from Citadel-Station-13/upstream-merge-31336
[MIRROR] Fixes lighting object initialization on new zlevels.
2017-10-07 01:05:11 -04:00
LetterJayandGitHub df53b21666 Merge pull request #3180 from Citadel-Station-13/upstream-merge-31314
[MIRROR] Fixes outdated away code.
2017-10-07 01:04:19 -04:00
LetterJayandGitHub edce74eb51 Merge pull request #3179 from Michiyamenotehifunana/toyguns
Adds more toy guns
2017-10-07 01:04:03 -04:00
LetterJayandGitHub 54fe9d3d96 Merge pull request #3178 from Citadel-Station-13/upstream-merge-31330
[MIRROR] Fixes runed metal and brass sprites
2017-10-07 01:03:35 -04:00
LetterJayandGitHub f9dcfc6e35 Merge pull request #3177 from Citadel-Station-13/upstream-merge-31333
[MIRROR] Sets turf decal layer
2017-10-07 01:03:25 -04:00
LetterJayandGitHub 46ec25b161 Merge pull request #2603 from deathride58/crewobjectivesandmiscreants
Ports Goon's Crew Objectives (feat. objectives from old Hippie) and Miscreants
2017-10-07 01:02:37 -04:00
LetterJayandGitHub c7617dc4a4 Merge pull request #3169 from Citadel-Station-13/upstream-merge-31326
[MIRROR] Cleans up leftover Hand of God gamemode references
2017-10-07 01:02:12 -04:00
LetterJayandGitHub 89ab9a0fd7 Update rdconsole.dm 2017-10-06 22:24:24 -05:00
LetterJayandGitHub 493352f680 Update stationCollision.dm 2017-10-06 22:23:31 -05:00
LetterJayandGitHub 2b42ad5200 Update decal.dm 2017-10-06 22:22:35 -05:00
LetterJayandGitHub 3f6d7d5244 Merge pull request #3176 from Citadel-Station-13/upstream-merge-31338
[MIRROR] Fix spelling of conscious
2017-10-06 23:20:58 -04:00
LetterJayandGitHub da2ee4b4b1 Update _defines.dm 2017-10-06 22:20:27 -05:00
Kerbin-FiberandCitadelStationBot 19ff9a0f75 Fixes Wood Being Invisible. (#31364)
* Fixes Wood

* Makes jackboots store items small and smaller just like in the description.

* Update internal.dm
2017-10-06 21:46:15 -05:00