Commit Graph

24225 Commits

Author SHA1 Message Date
Jordan Brown 63a7018fb5 Merge pull request #35453 from 81Denton/aluminium-with-two-i
Aluminium with two i
2018-02-09 09:44:10 -05:00
Jordan Brown ebcac584df Merge pull request #35454 from DaxDupont/You-didn't-have-to-smile-at-me,-Your-grin's-the-sweetest-that-I've-ever-seen,But-you-did.-Yes-you-did
Adds defib to techwebs
2018-02-09 09:43:43 -05:00
vuonojenmustaturska 1c656f0e08 Merge pull request #35446 from 81Denton/can-synth
can_synth uses TRUE/FALSE
2018-02-09 10:41:15 +02:00
vuonojenmustaturska 9131022a9a Merge pull request #35476 from AutomaticFrenzy/patch/goliath-hide
Fix goliath hide plates not applying to suits correctly
2018-02-09 10:26:13 +02:00
Jordan Brown 724719c34a Merge pull request #35405 from MrStonedOne/fixterry
Fixes job exp updates hounding the database more than it needed to.
2018-02-09 00:05:27 -05:00
Jordan Brown ca3976fc1d Merge pull request #35435 from optimumtact/mrtyhasahorsecunt
Revert "Adds the saltmine shuttle. (#35369)"
2018-02-09 00:03:36 -05:00
Tad Hardesty e6ba6e17cf Fix goliath hide plates not applying to suits correctly 2018-02-08 19:08:58 -08:00
Robustin 7dee5379d7 Cult fixes and UI improvement (#35178)
* Blood spell fixes and UI improvement

* Bastard sword bug

* Update blood_magic.dm

* woops parenthesis

* Update blood_magic.dm

* space
2018-02-09 14:10:50 +13:00
Jordan Brown a3d9133016 Merge pull request #35419 from kevinz000/patch-446
fixes beam rifle zooming
2018-02-08 16:18:29 -05:00
PKPenguin321 d1c1a28128 adds italian moustache that makes you italian (#35426)
* makes the moustache make you italian

* Revert #34916

* fixes travis i think

removes duplicate replace

* puts the mask on by default, undoes dynamic-a speech-a

rip

* removes unneeded varedits

saves 2 lines woo
2018-02-08 15:29:23 -05:00
vuonojenmustaturska 1c8e450f15 Fixes geiger counters on engiborgs (#35423)
* a commit

* Update geiger_counter.dm
2018-02-08 12:21:06 -05:00
Dax Dupont 8490b1560a Adds defib to techweb 2018-02-08 16:22:38 +01:00
Jordan Brown 6b90cc824a Merge pull request #35410 from ShizCalev/ai-loc-fix
Fixes primary AI spawning at incorrect locations
2018-02-08 10:04:33 -05:00
Jordan Brown 211dd43a68 Merge pull request #35412 from DaxDupont/flags-are-for-fags
Brings certain designs in line with others.
2018-02-08 10:03:51 -05:00
81Denton fa4dce2943 part 2 2018-02-08 15:43:44 +01:00
81Denton 718e50548e true/false 2018-02-08 11:16:20 +01:00
Iamgoofball 10a24645c6 Adds basic trailer support to vehicles (#35388)
* Adds basic trailer support to vehicles

* Move compat.
2018-02-08 22:21:42 +13:00
Dax Dupont fc3ad5dc66 SM can explode on space tiles again (#35275)
* Reordered some of the SM logic

* make it a little slower

* It does not explode instantly i tested
2018-02-08 22:12:56 +13:00
Evsey Antonovich 31c973f38c Circuit drone + grabber/thrower balance changes (#34834)
* makes grabbers bulky and inventory max bulky

* makes circuit drones bulky

* removes drone stacking

* made grabbers max w class based on drone assembly, changed their w class back to small

* review stuff

* makes throwers max_w_class depend on assembly size

* uh

* kills sheer heart attack

* fuck off

* FUCK

* GR
2018-02-08 22:10:48 +13:00
oranges a0624c5909 Merge pull request #35346 from DaxDupont/kinky-cuffs
Fixes cyborg related cuffing issues
2018-02-08 22:07:07 +13:00
MoreRobustThanYou 1c42a8186a Heart Disease 2: Electric Boogaloo (#35296)
* Heart Disease 2: Electric Boogaloo

* Upd8
2018-02-08 22:01:55 +13:00
oranges 4f2352e1d2 Merge pull request #35401 from MrStonedOne/patch-475
[s]Closes exploits in proc calling admin rank datum procs.
2018-02-08 21:53:58 +13:00
Kyle Spier-Swenson 90e204105c [s]Closes exploits in proc calling admin datum procs. (#35399)
* Closes exploits in proc calling admin datum procs.

There is likely one in ranks, but that can be its own pr.

* Update holder2.dm
2018-02-08 21:53:43 +13:00
MMMiracles d72c564191 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 21:23:13 -05:00
oranges b1f301b39b Revert "Adds the saltmine shuttle. (#35369)"
This reverts commit c7ee29b5b0.
2018-02-08 01:49:57 +00:00
ShizCalev dc862ad931 Var cleanup and map fixes 2018-02-07 17:10:22 -05:00
kevinz000 b9de200c67 user dropping 2018-02-07 08:06:48 -08:00
Dax Dupont 7faad2e7e8 Brings certain designs in line with others 2018-02-07 15:36:43 +01:00
Armhulen 96b9e5bf88 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 16:12:47 +02:00
Dax Dupont c7ee29b5b0 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 15:16:54 +02:00
MrStonedOne 7fa0f51abf Fixes job exp hounding the database more than it needed to.
There is no need to select the current values if we make sure to use the right operations.
Next on my list is a more generic batched sql system that can do things like select rows based on a list of primary keys, using one query (by abusing the in keyword) as well has abtract away the need to directly do overriding add_timers.
2018-02-07 03:57:15 -08:00
vuonojenmustaturska 64862f285b Merge pull request #35258 from kevinz000/patch-441
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 13:39:48 +02:00
vuonojenmustaturska e264c15aac Merge pull request #35385 from AnturK/custoantagfixup
Fixes custom antags for random event morph/slaughter demon.
2018-02-07 13:22:38 +02:00
Dax Dupont 6f7e89f07f Holopictures and more! (#35303)
* Holopictures and more!

* Remiedation
2018-02-07 13:16:44 +02:00
81Denton 6c0f6fbf4a Prevents fungal TB spores from being synthesized (#35381)
* can_synth 0 for fungal TB

* 0 -> FALSE
2018-02-07 12:57:01 +02:00
vuonojenmustaturska c0fa971817 Merge pull request #35374 from AutomaticFrenzy/patch/pressure
Fix pressure damage not taking effect properly
2018-02-07 12:56:20 +02:00
Ashe Higgs 19482e5907 Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates (#35194)
* Adds anomalous pizza boxes

* Improves the code a tad, makes it favorite

* let's format this a bit better!

* Update pizzabox.dm

* Makes the message_admins call only without report
2018-02-07 12:51:58 +02:00
vuonojenmustaturska a636d69f2a Merge pull request #35356 from DaxDupont/chime
Makes the posibrain play a ping sound on success.
2018-02-07 12:41:38 +02:00
ShizCalev 5538a3ead4 Fixes primary AI spawning at incorrect locations 2018-02-07 03:39:32 -05:00
Kyle Spier-Swenson a9439a1534 Closes exploits in proc calling admin rank datum procs. 2018-02-06 17:41:28 -08:00
Slignerd cb98e8d41b 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-06 18:02:47 -05:00
Robustin 616444a14c Reverts oysters (#35361) 2018-02-06 16:43:06 -05:00
BordListian c582b897da 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-06 15:16:26 -06:00
vuonojenmustaturska 3db6e34dda Merge pull request #35353 from Robustin/constructlimit
Reduced shards and shells for the cult
2018-02-06 21:37:28 +02:00
Jordan Brown bd489f1aff Merge pull request #35349 from DaxDupont/ifuckinghatethese
Moves the pocket protector to lockers instead of on the uniform.
2018-02-06 11:45:19 -05:00
AnturK 4a046df6df Fixes custom antags for random event morph/slaughter demon. 2018-02-06 14:59:33 +01:00
kevinz000 a12f4491aa [READY]Explosive Hot Potatoes - Service department job restricted traitor item (#34741)
* Hot Potato!

* Hot Potato!
2018-02-06 08:37:25 -05:00
Jordan Brown e26130621d Merge pull request #35350 from MrStonedOne/patch-473
Fixes sleeps in movement procs creating lag in ssinput.
2018-02-06 08:32:11 -05:00
KorPhaeron 0f24c8c04f Syndicate Comms base now has GPS signal (#35078) 2018-02-06 11:14:11 -02:00
Robustin b87a9f6a15 Fixed insufficient cultists warning (#35292)
* Fixed insufficient cultists warning

* Insufficient cultist fix

* removed duplicate var

* Update runes.dm
2018-02-06 13:54:17 +01:00