Commit Graph

11521 Commits

Author SHA1 Message Date
r4d6
6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
kevinz000
a8a5ff819d Update IsBanned.dm 2020-01-05 10:06:09 -08:00
kevinz000
4589c7c0c6 Update IsBanned.dm 2020-01-05 08:52:00 -08:00
Ghom
59279a7cd4 Merge pull request #10433 from Citadel-Station-13/kevinz000-patch-7
nerfs pogscarabs
2020-01-05 16:23:37 +01:00
Ghom
516ec585d2 Merge pull request #10435 from Hatterhat/tg-40394
biogenerator can print flour sacks and enzyme now, also some boxes idk
2020-01-05 16:22:44 +01:00
Ghom
5720afb169 Merge pull request #10430 from Citadel-Station-13/VIBE-CHECK
VIBE CHECK
2020-01-05 15:51:32 +01:00
Ghom
8bf75be8ff Yea no, go away zoomer kevinz 2020-01-05 15:38:23 +01:00
Ghom
4655815c12 Merge pull request #10396 from Hatterhat/revert-8056-tegnerf
reverts that one TEG nerf that forced it to require an arbitrary burnmix
2020-01-05 15:36:02 +01:00
Ghom
0646a8557b Merge pull request #10428 from Putnam3145/bomb_fix
Made dev bombs kill through bomb armor again
2020-01-05 15:33:54 +01:00
Ghom
fdff70b702 Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
2020-01-05 15:19:48 +01:00
Ghom
0e74c94d8c Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
2020-01-05 15:17:14 +01:00
Ghom
2cbf2a2574 Merge pull request #10429 from Trilbyspaceclone/patch-262
Corrects MASON Rig's missing flags
2020-01-05 15:09:05 +01:00
Trilbyspaceclone
609f120c28 Update hardsuit.dm 2020-01-04 22:29:42 -05:00
Ghom
ca8d93ad17 Merge branch 'master' into alcohol-intolerance 2020-01-04 23:17:55 +01:00
Ghom
9e257599ab Merge pull request #10413 from nik707/master
Reduces engraving light power
2020-01-04 22:30:37 +01:00
Ghom
a75b8a387e ok 2020-01-04 18:30:37 +01:00
Hatterhat
92f6fe129a tgstation 40394 port 2020-01-04 07:14:39 -06:00
Ghom
499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
kevinz000
a930464f57 Update extra_drone_types.dm 2020-01-04 00:54:06 -08:00
kevinz000
0567dcd6df Update godhand.dm 2020-01-03 23:34:37 -08:00
kevinz000
a4fa24ac15 Update touch_attacks.dm 2020-01-03 23:33:39 -08:00
Trilbyspaceclone
94fb114611 Update hardsuit.dm 2020-01-04 02:11:23 -05:00
Putnam
b1b1d7171e hard crit actually 2020-01-03 23:07:34 -08:00
Putnam
e54ec9ec09 shh 2020-01-03 23:03:45 -08:00
nik707
8054b08dc3 reduces light power of soapstone engravings 2020-01-02 23:11:40 -06:00
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers
n word
2020-01-02 22:01:19 -06:00
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Lin
b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
2020-01-03 00:00:51 +00:00
Lin
4b7e6ec2a5 Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
2020-01-02 23:56:43 +00:00
Lin
5d667a3540 Merge pull request #10388 from CameronWoof/ez-valids
Adds the "View Crew Manifest" verb to Robots
2020-01-02 23:54:14 +00:00
kevinz000
b580d1dc32 Merge pull request #10390 from deathride58/orangespleasestopforcepushing
[s] removes fun
2020-01-02 08:56:49 -08:00
kevinz000
67d9923ff7 Merge pull request #10371 from kappa-sama/patch-15
call of duty loot boxes
2020-01-01 22:08:20 -08:00
kevinz000
16172f68aa Merge pull request #10366 from Hatterhat/beaker-buff
beaker buff - alt title fuck hypovials and fuck making them free and better alternatives to beakers
2020-01-01 22:07:40 -08:00
nik707
a881231149 Merge pull request #10395 from Hatterhat/shit-and-cum
space cola isnt a reagent idiot, codeside change only
2020-01-01 20:45:33 -06:00
Hatterhat
5b99524e82 Revert "Makes the efficiency of the TEG be dependant on how much gas is actively combusting in the hot pipe" 2020-01-01 20:44:48 -06:00
Hatterhat
1195762f86 space cola isnt a reagent idiot 2020-01-01 20:37:09 -06:00
nik707
1e6a485976 Merge pull request #10368 from Hatterhat/orm-laser-fix-question-mark
ORM lasers actually affect point return
2020-01-01 20:32:48 -06:00
nik707
75d5e324ec Merge pull request #10379 from Hatterhat/tg-47443-shotgunpbs
shotgun pointblanking people actually throws them
2020-01-01 20:32:16 -06:00
nik707
e232b13119 Merge pull request #10369 from Hatterhat/patch-4
crusher trophy drop chance increase
2020-01-01 20:28:35 -06:00
deathride58
8390334d1e mirrors tgstation 48524 2020-01-01 18:59:05 -05:00
CameronWoof
9a54467064 Robots can now view the crew manifest 2020-01-01 14:38:46 -08:00
Hatterhat
200de62b8e tweaks transfer amounts, uncucks hypovials 2020-01-01 08:50:15 -06:00
kevinz000
68bc6dcc2a Update megafauna.dm 2020-01-01 02:43:43 -08:00
Hatterhat
0374870c41 bulldogs knockback too 2020-01-01 02:04:03 -06:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
Hatterhat
318a6812c3 manually copied tgstation#47443 2019-12-31 21:38:11 -06:00
kevinz000
ec67a38093 Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
2019-12-31 19:32:05 -08:00
kevinz000
c222ea0bb3 Merge pull request #10356 from deathride58/sprintprefs
Adds space to sprint and toggle sprint as preferences
2019-12-31 19:29:47 -08:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
kevinz000
f920e7b73c changes 2019-12-31 10:08:14 -08:00