Commit Graph

25687 Commits

Author SHA1 Message Date
Jordan Brown
1b50671ca0 Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun
Fix runtimes when energy guns are deleted
2018-06-25 15:11:28 -04:00
Mickyan
3423fb8ce0 branca menta fix, move fernet to contraband 2018-06-25 18:16:12 +02:00
Jordan Brown
56d09b618c Merge pull request #38699 from Irafas/HardsuitEyeFix
Hardsuit helmets protect eyes from pepperspray
2018-06-25 10:19:19 -04:00
Jordan Brown
0f6ecbb92b Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd
Fix the MOTD having too many newlines
2018-06-25 10:18:20 -04:00
Jordan Brown
f2c9a173df Merge pull request #38683 from AnturK/anomalyfix
Fixes anomaly area selection.
2018-06-25 10:17:59 -04:00
Jordan Brown
c73e424566 Merge pull request #38696 from Tlaltecuhtli/patch-53
fixes a cult message.fixes a cult message.
2018-06-25 10:15:01 -04:00
Jordan Brown
68dfb50c5c Merge pull request #38697 from DaxDupont/a
Improves machine overload logging
2018-06-25 10:14:50 -04:00
Tad Hardesty
9fbb368b28 Fix being unable to export mechs 2018-06-24 16:16:51 -07:00
Tad Hardesty
121cbdb899 Fix runtimes when energy guns are deleted 2018-06-24 15:07:09 -07:00
CitrusGender
501fd35cba Fixed cyborgs not getting their names at round start (#38675)
* fixed cyborgs not getting their names at round start
fixed cyborgs and A.Is being able to get around appearance bans

* Update job.dm

* Update silicon.dm

* goodbye unneeded config otpion

* Update game_options.txt
2018-06-24 21:55:13 +03:00
James
66295cc639 Hardsuit helmets protect eyes from pepperspray 2018-06-24 16:15:37 +01:00
Jordan Brown
d52c2587b8 Merge pull request #38684 from AutomaticFrenzy/patch/goonchat-logs
Allow actually saving Goonchat logs
2018-06-24 10:45:15 -04:00
cinder1992
9e5769be7b Added Officer's Sabre suicide (#38662)
* Added Officer's Sabre sucide

* Oopsie

* Brute for the Brute God!

* pick_n_take is a thing

* Cleanup

* Cleanup 2: Electric Boogaloo

* Sabre suicide covers all arms and legs

* Suicides now take the same ammount of time for users with more than two arms and two legs
2018-06-24 10:44:27 -04:00
Jordan Brown
00eb79eac4 Merge pull request #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild
Blacklisted buggy build 1428
2018-06-24 10:16:36 -04:00
Dax Dupont
63b0e46a63 Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Wat zullen we drinken Zeven dagen lang Wat zullen we drinken, wat een dorst Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Dan zullen we werken Zeven dagen lang Dan zullen we werken, voor elkaar Dan zullen we werken Zeven dagen lang Ja zullen we werken, voor elkaar Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Dan is er werk voor iedereen Dus werken we samen Zeven dagen lang Ja werken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Er is genoeg voor iedereen Dus drinken we samen Sla het vat maar aan Ja drinken we samen, niet alleen Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Eerst moeten we vechten Niemand weet hoe lang Eerst moeten we vechten, voor ons belang Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen Voor het geluk van iedereen Dus vechten we samen Samen staan we sterk Ja vechten we samen, niet alleen 2018-06-24 14:45:07 +02:00
Dax Dupont
a2b47825d0 We won't reveal our ailments, and what haunts our sleep nightly In this tiny little world, we've locked ourselves in so tightly And the dead stand between us like wreaths and the people we've abandoned The life, we've surrendered to the streams O Rhodesia, I've given you my all And now, I'm nothing I'm nothing, I'm nothing, I'm nothing, I'm nothing One fire fights one fire One nail one nail Rights by rights falter Strengths by strengths do fail One fire fights one fire One nail one nail Rights by rights falter Strengths by strengths do fail All that's left now are dreams of kings we've murdered to dissect For our meddling intellect misshapes the beauteous forms of things So, we bleat a little, twist a little, rotting in the belly of the beast, while you feel You cannot be wrong O Rhodesia, I've given you my all And now, I'm nothing I'm nothing, I'm nothing, I'm nothing, I'm nothing 2018-06-24 13:52:52 +02:00
Tlaltecuhtli
e5351d4064 fixes a cult message.fixes a cult message. 2018-06-24 12:01:56 +02:00
Jordie
21f96755b5 blacklisted buggy 1428 2018-06-24 15:28:18 +10:00
AnturK
1572321137 Adds make_associative helper. 2018-06-23 22:22:05 +02:00
kevinz000
8ae46cf5bf Cyborgs now drop radio keys on detonation/destruction (#38617)
* Cyborgs now drop radio keys on detonation/destruction

* Woops!

* Update robot.dm

* Use atom rather than turf
2018-06-23 12:03:36 -07:00
Time-Green
fc0a7e4864 Fixes closed soda cans transferring (#38668) 2018-06-23 11:30:36 -07:00
Tad Hardesty
5a79952716 Allow actually saving Goonchat logs 2018-06-23 11:25:19 -07:00
AnturK
99cdc677b3 Forgot this 2018-06-23 18:06:00 +02:00
AnturK
7b80231d6c Fixes anomaly area selection 2018-06-23 18:04:05 +02:00
ninjanomnom
bbb4147aa2 Some uplink component GetComponent cleanup 2018-06-23 01:41:34 -04:00
Tad Hardesty
657c2f70f1 Fix the MOTD having too many newlines 2018-06-22 18:19:40 -07:00
Jordan Brown
6a603b733d Ports more things to Initialize (#38653) 2018-06-22 16:56:09 -07:00
Denton
27c3fbea35 hey made in abyss is pretty cool 2018-06-22 16:01:51 +02:00
Jordan Brown
e460a70dca Removes unused defines (#38650) 2018-06-22 09:04:37 +02:00
kevinz000
2ed42f44a7 Fixes HE pipes not respecting layering (#38468)
* HE pipes fix

* Heat exchange stuff
2018-06-22 08:59:09 +02:00
KorPhaeron
53af80d26a Bubblegum is scarier again (#38306)
Miners are able to kill him roundstart by just walking backwards while shooting. Weaker than an ash drake.

Easiest way to change this was to give him his original attacks back which required you to avoid/manage blood.
2018-06-22 11:55:48 +12:00
Tlaltecuhtli
24b21b8416 [READY] better contraband crates (#38321)
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
2018-06-22 11:51:29 +12:00
kevinz000
961fbfc99a Fixes and adds blast cannons to traitor science uplink items (#38093)
rscadd: Blast cannons have been fixed and are now available for purchase by traitorous scientists for a low low price of 14TC.
rscadd: Blast cannons take the explosive power of a TTV bomb and ejects a linear projectile that will apply what the bomb would do to a certain tile at that distance to that tile. However, this will not cause breaches, or gib mobs, unless the gods (admins) so will it.
experimental: Blast cannons do not respect maxcap. (Unless the admins so will it.)
2018-06-22 11:38:29 +12:00
Jordan Brown
43e5f8308a Merge pull request #38637 from DaxDupont/create-antag
Makes create antags check for on station.
2018-06-21 19:18:41 -04:00
Jordan Brown
2616677876 Merge pull request #38633 from ExcessiveUseOfCobblestone/patch-46
potency gene disks now clarify what the % means on examine
2018-06-21 17:54:21 -04:00
YPOQ
d4136f4a65 Fixes gulag stacker not giving points after RPG loot event (#38570)
* Fixes gulag stacker not giving points after RPG loot event

* Moves point values to type vars

* cleanup
2018-06-21 17:30:13 -04:00
Tad Hardesty
d4471d8fd9 Fix invalid use of fractional planes 2018-06-21 14:04:51 -07:00
Tad Hardesty
bc72fef8f5 Port AI static to vis_contents 2018-06-21 01:01:32 -07:00
BlueNothing
beb119ff0b Preventing grabbers from holding other circuits is a simple (one-line) fix that strongly nerfs so-called 'uberthrower' circuits, dropping their damage output drastically. Uberthrower circuits are one of the most famous unintended uses of circuits. (#38621) 2018-06-21 03:41:51 -04:00
Tad Hardesty
b754e47b09 Tidy up cameranet code slightly 2018-06-20 21:58:58 -07:00
CitrusGender
7b6f87dea3 Fixes ruins air alarms showing up on station tablets (#38478)
* Fixes ruins air alarms showing up on station tablets

* Update alarm.dm

* Update alarm.dm
2018-06-20 22:07:42 -04:00
ShizCalev
f338f09207 Cleanup & corrections 2018-06-20 21:57:17 -04:00
Dax Dupont
1656161908 Makes create antags check for on station. 2018-06-21 00:21:25 +02:00
Grandmother of 50
0e67143c2d Update gene_modder.dm 2018-06-20 16:46:00 -04:00
1fbff5f83b23d39d38b1dfcb4cac8d9b
1572e4f122 Adds atmos circuit (#38111)
* Adds gas circuits

* Integrated connector

* Filters, tanks, some balancing

* fixed fucky wucky in tank size

* maybe they'll appreciate you more one day

* this code was written by a gibbon
2018-06-20 13:38:23 -07:00
Tlaltecuhtli
dda6e00274 fixes anomaly cores being flamable (#38607)
* oranges-is-gay

* swap
2018-06-20 13:32:48 -07:00
Jordan Brown
98b7d8c360 Merge pull request #38613 from 81Denton/adv-medscanner-techwebs
Adds health analyzers to the medical protolathe
2018-06-20 13:52:21 -04:00
YPOQ
a308cc3740 Fixes temperature/watcher blasts (#38620) 2018-06-20 17:32:47 +03:00
Jordan Brown
cb0f3a8a6f Merge pull request #38609 from AnturK/missedthatinreviewwhoops
Fixes chemnade logging and cleans up the reagent stringify helper
2018-06-20 10:26:18 -04:00
Jordan Brown
afbfaf4649 Merge pull request #38605 from vuonojenmustaturska/tinylight
Micro-optimization to update_corners()
2018-06-20 10:24:04 -04:00