2d499b938c
adds that farm your dad talked about sending your old pet catperson to so they could live out the rest of their lives free ( #35168 )
...
* adds a space ruin for where dad tells you they sent your pet catperson to live on a farm where they can be free and chase all the grayshirts they want
* dirty vars
* Vars
* changes windoor to proper subtype, removed extra circular saw
* area/space to area/ruin/unpowered, added gps tag
* in area/space nobody can hear you scream
* Update mrow_thats_right.dmm
if i scream, scream, scream, about a good man's life, would you ever stop and listen, would you open up your eyes
* cat
2018-02-07 20:23:32 -06:00
717da969a6
[MIRROR] Var cleanup and map fixes ( #5359 )
...
* Merge pull request #35429 from ShizCalev/snowdin-cleanup
Var cleanup and map fixes
* Var cleanup and map fixes
2018-02-07 20:04:04 -06:00
ae03e3daa4
Merge pull request #5348 from Citadel-Station-13/upstream-merge-35194
...
[MIRROR] Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates
2018-02-07 20:51:55 +00:00
a3f3e50f0a
Merge pull request #5356 from Citadel-Station-13/upstream-merge-35386
...
[MIRROR] balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess)
2018-02-07 19:12:13 +00:00
8e439ec317
Merge pull request #5354 from Citadel-Station-13/upstream-merge-35369
...
[MIRROR] Adds the saltmine shuttle.
2018-02-07 19:11:31 +00:00
9c1effc0ff
Merge pull request #5353 from Citadel-Station-13/upstream-merge-35258
...
[MIRROR] Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 19:11:14 +00:00
fc74a6a341
Merge pull request #5351 from Citadel-Station-13/upstream-merge-35303
...
[MIRROR] Holopictures and more!
2018-02-07 19:10:37 +00:00
f8a9899df4
Merge pull request #5350 from Citadel-Station-13/upstream-merge-35381
...
[MIRROR] Prevents fungal TB spores from being synthesized
2018-02-07 19:10:10 +00:00
e7fa382cd4
Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374
...
[MIRROR] Fix pressure damage not taking effect properly
2018-02-07 19:09:52 +00:00
be212dd736
Update packs.dm
2018-02-07 14:09:28 -05:00
41bacce125
Merge pull request #5346 from Citadel-Station-13/upstream-merge-35356
...
[MIRROR] Makes the posibrain play a ping sound on success.
2018-02-07 19:08:09 +00:00
1e0155d1c8
Merge pull request #5343 from Citadel-Station-13/upstream-merge-35353
...
[MIRROR] Reduced shards and shells for the cult
2018-02-07 19:07:24 +00:00
2732823a68
Merge pull request #5342 from Citadel-Station-13/upstream-merge-35277
...
[MIRROR] Forces gases to obey certain laws of nature
2018-02-07 19:07:01 +00:00
65a470611d
Merge pull request #5341 from Citadel-Station-13/upstream-merge-35361
...
[MIRROR] Re-enables space runes on Station Z-Level
2018-02-07 19:06:12 +00:00
3819e8088b
Merge pull request #5340 from Citadel-Station-13/upstream-merge-35212
...
[MIRROR] Squashes silicon HUDs together
2018-02-07 19:05:56 +00:00
ae5fa73809
balances the netherworld link, spawners can now spawn from a pool of mobs, and the netherworld link can now summon all three types of netherworld critters. (and mining spawner cleanup for admin events i guess) ( #35386 )
...
* woah totally wacky wazoo
* OH I'M SAYIN IT
* donezo now lets do the rest lol
* commiting this so i can revert back to it when nobody likes my changes past this point
* 🙏
* jesus
* christ
* move'd
2018-02-07 08:13:45 -06:00
0f8b7da2a1
Adds the saltmine shuttle. ( #35369 )
...
* Adds the saltmine shuttle
* Adds an orange, makes the revolver a reverse one
* henk
* honker
* pay me
* more cat and cat accessories
* memes
* Crybabies jeeez
* Salt is expensive
* There now it's an easter egg shuttle
* nani
2018-02-07 07:17:50 -06:00
b678bcf8eb
Merge pull request #35258 from kevinz000/patch-441
...
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 05:40:34 -06:00
ed18c63441
Holopictures and more! ( #35303 )
...
* Holopictures and more!
* Remiedation
2018-02-07 05:17:41 -06:00
d68cd9fe9a
Prevents fungal TB spores from being synthesized ( #35381 )
...
* can_synth 0 for fungal TB
* 0 -> FALSE
2018-02-07 04:57:58 -06:00
9bb3ce1931
Merge pull request #35374 from AutomaticFrenzy/patch/pressure
...
Fix pressure damage not taking effect properly
2018-02-07 04:56:44 -06:00
cf66c8c79c
Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates
2018-02-07 04:52:27 -06:00
23843241b4
Merge pull request #35356 from DaxDupont/chime
...
Makes the posibrain play a ping sound on success.
2018-02-07 04:41:52 -06:00
5be63dbaab
Merge pull request #35353 from Robustin/constructlimit
...
Reduced shards and shells for the cult
2018-02-07 02:32:39 -06:00
9b910552fd
Forces gases to obey certain laws of nature ( #35277 )
...
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.
* - Redundant parenthesis
- I'm going back to sleep
* - Sends fire and fusion to jail
* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors
* - Reverted the tritium burn changes because apparently I'm dumb
* - FUCK
* - Fixes division by zero when fusion has no impurities
* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs
* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
6db2219f20
Reverts oysters ( #35361 )
2018-02-07 02:32:22 -06:00
afcdb771b3
Squashes silicon HUDs together ( #35212 )
...
* Squashes silicon sensors together
* Fixes proc names
* Brings back individual sec/med huds for pai usage
* This fixes the pai
* Fixes toggle text
2018-02-07 02:32:14 -06:00
d236b75ca0
adds widescreen pref
2018-02-07 01:42:31 -05:00
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
b6c4bd6e01
[MIRROR] Fixes bloodpack sprite issues ( #5333 )
...
* Fixes bloodpack sprite issues
* Update packs.dm
* fuck this godamn map
2018-02-06 18:24:51 -06:00
380556dde4
Merge pull request #5330 from Citadel-Station-13/upstream-merge-35156
...
[MIRROR] Slaughter demon, Morph, ERT / Deathsquad antag datums.
2018-02-06 17:54:05 +00:00
1d4e0d3511
Oops, copy paste fail
2018-02-06 09:56:36 -06:00
1bf0cdac64
Update slaughterevent.dm
2018-02-06 09:56:10 -06:00
35dcf5dce1
Update slaughter.dm
2018-02-06 09:50:12 -06:00
79cb10f8ec
Update morph.dm
2018-02-06 09:49:46 -06:00
469abfd599
Update vent_clog.dm
2018-02-06 02:16:25 -06:00
1cea674509
Update antag_spawner.dm
2018-02-05 21:35:15 -06:00
156fa1da1a
Update antag_spawner.dm
2018-02-05 21:47:53 -05:00
5357d4bd69
Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322
...
[MIRROR] Adds missing wrapper for abductor roundend report.
2018-02-06 02:46:05 +00:00
c9f7e7f14a
Merge pull request #5321 from Citadel-Station-13/upstream-merge-35152
...
[MIRROR] Rearranges mining vendor items and code, adds conscription kit
2018-02-06 02:43:57 +00:00
024347aff2
Merge pull request #5320 from Citadel-Station-13/upstream-merge-35282
...
[MIRROR] Eggs from the abductor egg gland now have a random reagent instead of acid
2018-02-06 02:43:35 +00:00
f9666ab6c9
Slaughter demon, Morph, ERT / Deathsquad antag datums.
2018-02-05 17:00:09 -06:00
ef986731ab
Merge pull request #35322 from AnturK/missing-wrapper
...
Adds missing wrapper for abductor roundend report.
2018-02-05 15:47:36 -06:00
33f83e3274
Merge pull request #35152 from 81Denton/mining-vendor-conscript
...
Rearranges mining vendor items and code, adds conscription kit
2018-02-05 09:38:46 -06:00
bdd791f307
Eggs from the abductor egg gland now have a random reagent instead of acid
2018-02-05 09:14:08 -06:00
4c6bdf1a9e
Snowdin 2.0
2018-02-05 09:10:40 -06:00
c4107ba117
[MIRROR] Fixes Luminous Slime spam ( #5286 )
...
* Fixes Luminous Slime spam
* Update jellypeople.dm
2018-02-05 04:56:39 -06:00
98d18ee7e3
[MIRROR] Removes tripai landmark ( #5280 )
...
* Removes tripai landmark
* Update landmarks.dm
2018-02-05 04:44:31 -06:00
e16db54c67
[MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic ( #5297 )
...
* Bartender Drink Sliding: Intrinsic to Extrinsic
* Update packs.dm
2018-02-05 04:42:13 -06:00
5c16755e58
[MIRROR] Fixes Vape Pen (e-cig) reagent spam ( #5296 )
...
* Fixes Vape Pen (e-cig) reagent spam
* Update cigs_lighters.dm
2018-02-05 04:33:36 -06:00
MMMiracles