Commit Graph

2757 Commits

Author SHA1 Message Date
LetterJay
ea41c07221 white 2017-10-08 22:47:42 -05:00
LetterJay
4f033a7137 Merge pull request #3244 from Citadel-Station-13/upstream-merge-31422
[MIRROR] Internals set to 0 pressure will properly prevent breathing environment air
2017-10-08 23:35:56 -04:00
LetterJay
7d4b0961f0 Merge pull request #3243 from Citadel-Station-13/upstream-merge-31358
[MIRROR] Basilisks are now gold core spawnable: Cyberboss likes me this time edition
2017-10-08 23:35:43 -04:00
LetterJay
b796fdb31e Merge pull request #3238 from Citadel-Station-13/upstream-merge-31379
[MIRROR] Layers pAIs under mobs to stop bodyblocking
2017-10-08 23:32:22 -04:00
XDTM
a49441b1e2 Internals set to 0 pressure will prevent breathing environment air (#31422) 2017-10-08 19:09:34 -05:00
Armhulen
62a6867f2e Makes Basilisks gold slime spawnable. (#31358) 2017-10-08 18:30:45 -05:00
kevinz000
687b329b7b Update pai.dm (#31379) 2017-10-08 15:47:32 -05:00
FrozenGuy5
3e6fcaec28 Fixes c20r damage (#31425)
* Fixes c20r damage

* minor pointless documentation
2017-10-08 15:36:04 -05:00
LetterJay
1f349aeccc Merge pull request #3233 from Citadel-Station-13/upstream-merge-31419
[MIRROR] Makes the noop turf less eyerapey
2017-10-08 16:24:41 -04:00
LetterJay
5e2deeff84 Merge pull request #3232 from Citadel-Station-13/upstream-merge-31411
[MIRROR] Dedicated equipment removal proc
2017-10-08 16:24:20 -04:00
LetterJay
56f05a8476 Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414
[MIRROR] Fixes mob swap on tables.
2017-10-08 16:23:43 -04:00
LetterJay
f046f4f15b Merge pull request #3225 from Citadel-Station-13/upstream-merge-31413
[MIRROR] Removes useless commented-out what-if code from the 1970s
2017-10-08 16:22:10 -04:00
LetterJay
71cec9faad Merge pull request #3223 from Citadel-Station-13/upstream-merge-31409
[MIRROR] Buckled mobs rotation fix
2017-10-08 16:21:24 -04:00
LetterJay
8ea93639ca Merge pull request #3222 from Citadel-Station-13/upstream-merge-31405
[MIRROR] Gives ghosts direction is their meaningless existence
2017-10-08 16:21:06 -04:00
LetterJay
23eddf5a3c Merge pull request #3218 from Citadel-Station-13/upstream-merge-31306
[MIRROR] Fixes being able to sell camera mobs to CentCom
2017-10-08 16:20:11 -04:00
LetterJay
fe2e29f0f8 Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-08 16:19:12 -04:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
LetterJay
6cb68e06e3 Update autoimplanter.dm 2017-10-08 15:07:28 -05:00
LetterJay
4c408f4541 Update give.dm 2017-10-08 14:55:37 -05:00
LetterJay
86d9e5955a Update autoimplanter.dm 2017-10-08 14:51:27 -05:00
LetterJay
981c9b07bc Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374
[MIRROR] High pop reduced MC processing mode.
2017-10-08 15:36:39 -04:00
LetterJay
4a0d3c4d40 Update seed_extractor.dm 2017-10-08 14:35:35 -05:00
ShizCalev
4a9dbd1447 Makes the noop turf less eyerapey 2017-10-08 13:48:53 -05:00
AnturK
3f975a63b7 Dedicated equipment removal proc (#31411)
* Dedicated equipment removal proc

* department of redundancy department

* Whitespace makes me angry
2017-10-08 13:18:12 -05:00
AnturK
b5981147dd Fixes mob swap on tables. (#31414) 2017-10-08 13:15:50 -05:00
deathride58
5d0853e16a Crew objective/miscreant system tweaks (#3213)
* Loadsa tweaks

* adds miscreant pref, other fixes

* fixes runtime

* fixes compiling errors for REAL now hopefully

* HOPEFULLY fixes compiling errors

* COMPILE!
2017-10-08 10:05:40 -07:00
Jordan Brown
58fd7f2067 Merge pull request #31413 from vuonojenmustaturska/codejanitoring
Removes useless commented-out what-if code from the 1970s
2017-10-08 10:00:34 -05:00
Jordan Brown
8c4e9d6a02 Merge pull request #31409 from ninjanomnom/buckled-mobs
Buckled mobs rotation fix
2017-10-08 01:48:55 -05:00
Emmett Gaines
e5e8a807a2 fixes directionless ghosts having direction (#31405) 2017-10-08 01:37:34 -05:00
LetterJay
2606143343 Update limb_augmentation.dm 2017-10-07 22:52:12 -05:00
LetterJay
641ffe003b Update silicon.dm 2017-10-07 22:51:58 -05:00
LetterJay
5ce923a4d7 Update laborstacker.dm 2017-10-07 22:51:35 -05:00
LetterJay
cc3bd63d88 Update seed_extractor.dm 2017-10-07 22:51:05 -05:00
LetterJay
661c2d293b Update client_procs.dm 2017-10-07 22:45:04 -05:00
LetterJay
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
LetterJay
04846a2f66 Merge pull request #3203 from Citadel-Station-13/upstream-merge-31376
[MIRROR] Nightmare spawn event
2017-10-07 23:44:06 -04:00
ShizCalev
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
Jordan Brown
4f32b7a0d4 Moves assert_gas() into a define it should always have been, speeding up atmos slightly 2017-10-07 13:37:28 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Jordan Brown
91aa560f0d High pop reduced MC processing mode. 2017-10-07 08:42:43 -05:00
Jordan Brown
20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings
Fixes cool threads grammar issue
2017-10-07 08:42:36 -05:00
KorPhaeron
39728cc9b3 Nightmare spawn event (#31376)
* Nightmare Event

* Update nightmare.dm

* Standards
2017-10-07 08:41:25 -05:00
jughu
466a6806e1 Allows shotgun darts to cause reagent reactions (#31337) 2017-10-07 00:18:04 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
5988122386 Merge branch 'master' into upstream-merge-31397 2017-10-07 01:05:58 -04:00
LetterJay
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
LetterJay
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