Commit Graph

25571 Commits

Author SHA1 Message Date
KorPhaeron
41dc2df094 Merge pull request #16491 from bgobandit/speeling
Fixes spelling in cargo crates
2016-03-30 19:50:03 -05:00
AnturK
d97c28cb68 Merge pull request #16477 from ChangelingRain/nukeproperly
Nuke disc forcemoving properly removes it from storage items/mobs
2016-03-30 20:40:37 +02:00
Remie Richards
20597d0079 Merge pull request #16164 from Robustin/classiczombies
Make zombies 2spooky
2016-03-30 16:03:48 +01:00
KorPhaeron
f521cb2f90 Merge pull request #16460 from TehZombehz/honeyfood
Adds some honey foods | Changes mead recipe
2016-03-30 03:26:15 -05:00
bgobandit
0ee9691575 Fixes and standardizes spelling 2016-03-30 04:14:07 -04:00
TehZombehz
fa98ae963e Updates nutritional content with honey
Since honey supposedly also acts as a mild healing chemical, replacing
vitamin with honey seems optimal.
2016-03-30 03:07:27 -05:00
KorPhaeron
2a5fba89fd Merge pull request #16472 from coiax/gieger-in-suit-storage
Added: Radiation suit storage holds gieger counter
2016-03-30 02:28:47 -05:00
KorPhaeron
e6c52aa5b3 Merge pull request #16468 from PKPenguin321/patch-16
Scales back grab nerf
2016-03-30 02:27:59 -05:00
duncathan salt
5ff2020202 Merge pull request #16357 from Iamgoofball/fast
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-29 20:06:55 -06:00
Iamgoofball
68e752b461 Update fastprocess.dm 2016-03-29 18:45:22 -07:00
Iamgoofball
a03678419d WHOOOOPS 2016-03-29 18:44:56 -07:00
duncathan salt
63f0fccfd4 Merge pull request #16410 from Iamgoofball/patch-15
Disables minimum account age for TRAITORS and TRAITORS ONLY
2016-03-29 19:44:25 -06:00
Xhuis
b44fa098ac Fixes animated statues being invisible 2016-03-29 19:56:33 -04:00
KorPhaeron
76ca35b8a0 Merge pull request #16453 from tgstation/RemieRichards-action-button-reset
Fixes shift clicking action buttons not immediately resetting them.
2016-03-29 17:17:40 -05:00
Cheridan
4df97395bd Merge pull request #16436 from ExcessiveUseOfCobblestone/patch-1
You must be 18 or older to play
2016-03-29 13:30:38 -05:00
Cheridan
0bb49b1a97 Merge pull request #16440 from TehZombehz/papersack
Adds craftable paper sacks
2016-03-29 11:27:41 -05:00
Nerd Lord
698bf19e50 Nuke disc forcemoving properly removes from storage items/mobs 2016-03-29 12:23:45 -04:00
Razharas
c1e992e60c Merge pull request #16429 from ChangelingRain/datumholoname
Holoparasite Theme/Name Datums
2016-03-29 18:22:37 +03:00
TehZombehz
acd351bc15 Type replacement 2016-03-29 08:10:04 -05:00
Jack Edge
20072d681a Added: Radiation suit storage holds gieger counter
Added the gieger counter to the suit storage of radiation suits.

Other suits have specific items allowed, makes sense for radiation suits to be the same.
2016-03-29 09:23:08 +01:00
Cheridan
c879805b9d Merge pull request #16446 from Shadowlight213/tkdrgbreakingeverything
Fixes ooc bans and latejoin antag jobbans
2016-03-29 02:31:53 -05:00
TehZombehz
da31e890ab Changes Kor requested #1 2016-03-29 01:06:37 -05:00
PKPenguin321
8337562f41 applies changes to breakout probabilities
how come my salt PRs dont get merged but goofballs do
aggro grab:
25 -> 75 -> 50
neckgrab:
5 -> 50 -> 15
2016-03-28 22:17:21 -07:00
PKPenguin321
6c58930df5 scales back grab nerf
original value -> goof value -> new value
grab upgrade timer:
40 -> 100 (>2x bigger than original) -> 60 (1.5x bigger)
killgrab timer:
100 -> 150 -> 100 (didn't need to be changed originally)

readds the stun on neckgrab, but more than halves the duration
undoes the weaken nerf on the killgrab
2016-03-28 22:08:32 -07:00
Cheridan
d371fe770a Merge pull request #16421 from Iamgoofball/SALTY
[#SALTY] GRAB NERF [FUCK] [BALANCE] [#GRABDATNERF]
2016-03-28 22:03:49 -05:00
Cheridan
69ae309a48 Merge pull request #16435 from Ricotez/ghostpreferencefix
Fix ghost preference toggles and button name
2016-03-28 21:48:47 -05:00
TehZombehz
58b964c6da Adds some honey foods and changes mead
Adds honey buns, honey buns, and changes mead recipe to require honey.
2016-03-28 18:57:01 -05:00
Cheridan
cf7885addd Merge pull request #16402 from Core0verload/revert-15671-Newtaser
Revert "Introduces the new taser"
2016-03-28 18:44:34 -05:00
KorPhaeron
72ca319c7c Merge pull request #16431 from ChangelingRain/blobalert
Blobbernauts now have an alert when their factory is destroyed
2016-03-28 18:23:43 -05:00
Nerd Lord
c74b550eb4 fine okay 2016-03-28 19:13:24 -04:00
Joan Lung
ce28a7ef3b Merge pull request #16419 from Cheridan/sorrypete
Cleans up some text formatting
2016-03-28 18:09:05 -04:00
Robustin
319ad93b6a Update zombie.dm 2016-03-28 18:03:34 -04:00
Nerd Lord
4089b0e1d8 actually I needed that 2016-03-28 18:01:13 -04:00
Nerd Lord
e1b263a56a statpanel includes some useful information, like WHAT THE FUCK IS MY SUMMONER'S HEALTH 2016-03-28 17:48:11 -04:00
Nerd Lord
5b14030c6b typo fixes 2016-03-28 15:17:04 -04:00
KorPhaeron
9bb1408040 Merge pull request #16424 from RemieRichards/bee_fixes
Bee fixes and updates!
2016-03-28 13:49:42 -05:00
Remie Richards
a93cb0a01d Fixes shift clicking action buttons not immediately resetting them. 2016-03-28 19:09:11 +01:00
KorPhaeron
8c49ed7053 Merge pull request #16408 from Iamgoofball/patch-14
DEFIB: Splits up "no heart" and "body too old" messages
2016-03-28 12:23:35 -05:00
Nerd Lord
63ba8d1b49 </span> 2016-03-28 12:11:11 -04:00
Nerd Lord
420d637f1e span classes update, reset guardian can now remove specific guardians instead of checking for each 2016-03-28 12:02:07 -04:00
Cheridan
f04d370659 Merge pull request #16417 from Xhuis/fix_bundle_2
Small fix bundle
2016-03-28 10:39:24 -05:00
Cheridan
3f84549e96 tweak shadowling message slightly 2016-03-28 10:36:42 -05:00
Robustin
854fc36a5a Update zombie.dm 2016-03-28 10:51:36 -04:00
TehZombehz
a6a338ae76 More typo fixing
I swear I'm good at english
2016-03-28 02:43:21 -05:00
TehZombehz
dcaf8feecf Typo fix 2016-03-28 02:05:51 -05:00
TehZombehz
c83cc45ab2 Regular and smiley paper sack are now wearable if modified
Use a sharp object on an empty regular or smiley face paper sack to
craft their respective wearable paper sack hats.
2016-03-28 01:59:44 -05:00
Shadowlight213
d026232f63 Fixes latejoin antag jobbans 2016-03-27 23:28:41 -07:00
Shadowlight213
0679db361d Fixes ooc ban 2016-03-27 23:01:19 -07:00
TehZombehz
fe35d72828 Requirement to hold paper bag to change design removed 2016-03-28 00:01:50 -05:00
TehZombehz
37a3c4373b Adds craftable paper sacks
Adds craftable paper sacks
2016-03-27 23:37:43 -05:00