Commit Graph

22034 Commits

Author SHA1 Message Date
Fermi
04c3b0e66e Oops. 2019-07-01 14:13:31 +01:00
Fermi
779830e6c7 Compile check. Ready for update. 2019-07-01 14:13:22 +01:00
Thalpy
3c8025c477 Moving computers 2019-07-01 13:56:37 +01:00
Thalpy
48ce61580e Fixes viro oversight. 2019-07-01 12:36:24 +01:00
Thalpy
cf225f335a Forgot to rename the box. 2019-07-01 00:18:35 +01:00
Thalpy
937d6467e6 Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_ 2019-06-30 19:16:27 +01:00
Thalpy
538e0fad29 Oops 2019-06-30 02:06:30 +01:00
Thalpy
e09f189895 WELCOME TO PH'S HELL RIDE 2019-06-30 01:56:10 +01:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Thalpy
7be7f05228 Reduced pent, tweaked pH, tweaked MK, added beaker tally. 2019-06-29 08:50:20 +01:00
Thalpy
f8a93a035f Tweaking pH based on user feedback. 2019-06-29 07:32:00 +01:00
CitadelStationBot
c3ae7e5522 Automatic changelog generation for PR #8681 [ci skip] 2019-06-28 22:36:45 -05:00
kevinz000
fbbfb02364 Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
2019-06-28 20:36:43 -07:00
CitadelStationBot
43ca342d45 Automatic changelog generation for PR #8739 [ci skip] 2019-06-28 22:32:17 -05:00
kevinz000
c495a2aa47 Merge pull request #8739 from Sishen1542/makinggolemsgreatagain
Ports additional tg golem types! Leather, cardboard, bronze & bone. Ports bone hurting juice as well!
2019-06-28 20:32:15 -07:00
CitadelStationBot
d15892c99a Automatic changelog generation for PR #8729 [ci skip] 2019-06-28 22:30:46 -05:00
kevinz000
a6caf4c63f Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
2019-06-28 20:30:44 -07:00
CitadelStationBot
c199c9abb9 Automatic changelog generation for PR #8581 [ci skip] 2019-06-28 22:30:08 -05:00
kevinz000
7e1522b76b Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
2019-06-28 20:30:05 -07:00
Thalpy
44337c6a08 Forgot to update lists when removing all sizes from GLOB. 2019-06-29 03:16:54 +01:00
Thalpy
b6309d5a31 Fixes explosion bug, tweaks hypo and fiddles pH. 2019-06-29 02:47:32 +01:00
CitadelStationBot
77ed7c6428 Automatic changelog generation for PR #8737 [ci skip] 2019-06-28 15:03:55 -05:00
deathride58
7e943c0f42 Merge pull request #8737 from Ghommie/Ghommie-cit85
Fixes CWC construct shells being visible as ghost role to latejoiners.
2019-06-28 16:03:53 -04:00
Thalpy
a4edb0b69a Trying alternative fix for pH. 2019-06-28 18:50:28 +01:00
CitadelStationBot
48d358d364 Automatic changelog generation for PR #8728 [ci skip] 2019-06-28 12:16:27 -05:00
kevinz000
d4b9b52f10 Merge pull request #8728 from Sishen1542/JESUSFUCKFIXDISPENSERSALREADYGODDAMN
Dispensers now act like tg counterparts! Tweak to available chems in chem/soda/booze dispensers.
2019-06-28 10:16:25 -07:00
Thalpy
b8028242c0 Compile fixes 2019-06-28 17:16:21 +01:00
Thalpy
9ee17e4045 [TEST] redo pH on reaction. 2019-06-28 16:58:08 +01:00
Thalpy
4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Ghommie
d782f24395 change 2019-06-28 17:30:28 +02:00
Sishen
92f530eed1 left the , for diethyl when i removed saltpetre whoops 2019-06-28 08:34:35 -04:00
Sishen
84e60b1cd2 Update chem_dispenser.dm 2019-06-28 08:32:56 -04:00
CitadelStationBot
bd4ba5da88 Automatic changelog generation for PR #8720 [ci skip] 2019-06-28 07:28:37 -05:00
kevinz000
6c77443887 Merge pull request #8720 from Ghommie/Ghommie-cit76
Sort of porting MRE rations from Yogstation.
2019-06-28 05:28:35 -07:00
kevinz000
8a2a0100c5 Merge pull request #8772 from Sishen1542/bibleblack
quick bible fix, per kevinz request
2019-06-28 05:27:43 -07:00
kevinz000
83f84b01a1 Merge pull request #8700 from Sishen1542/trenchcloak
Adds a reskin option for HoS tenchcoat, the trenchcloak!
2019-06-28 05:24:11 -07:00
Sishen
555c1adf67 fix per kevs request 2019-06-28 08:20:59 -04:00
Sishen
1679a2c42b Merge remote-tracking branch 'upstream/master' 2019-06-28 08:20:12 -04:00
Sishen
1386161aff Revert "Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""""
This reverts commit 3fcc884ab5.
2019-06-28 08:20:06 -04:00
Sishen
3fcc884ab5 Revert "Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]"""
This reverts commit 81b9f94511.
2019-06-28 08:19:49 -04:00
CitadelStationBot
e336f2db52 Automatic changelog generation for PR #8731 [ci skip] 2019-06-28 07:19:06 -05:00
kevinz000
f7bbca8918 Merge pull request #8731 from Ghommie/Ghommie-cit81
Ports in microwave updates and its radial menu.
2019-06-28 05:19:04 -07:00
CitadelStationBot
a55a0b32ab Automatic changelog generation for PR #8708 [ci skip] 2019-06-28 07:18:37 -05:00
kevinz000
f76737dc04 Merge pull request #8708 from Trilbyspaceclone/patch-185
Corrects the "Durasteel" to be plastitanium tool boxes
2019-06-28 05:18:35 -07:00
CitadelStationBot
a8dfecdf25 Automatic changelog generation for PR #8726 [ci skip] 2019-06-28 07:14:59 -05:00
kevinz000
ee852382f8 Merge pull request #8726 from Sishen1542/biblethump
Tweaks to chaplain bible heals. Time to pull out the old brainbuster.
2019-06-28 05:14:57 -07:00
CitadelStationBot
506b63a9c7 Automatic changelog generation for PR #8760 [ci skip] 2019-06-28 07:12:46 -05:00
kevinz000
a103611d1b Merge pull request #8760 from Trilbyspaceclone/LoudnProud
Makes ling's adrendals have a loudness 2
2019-06-28 05:12:43 -07:00
Sishen
81b9f94511 Revert "Revert "Automatic changelog generation for PR #8738 [ci skip]""
This reverts commit 7e9ec43834.
2019-06-28 02:33:42 -04:00
Sishen
7e9ec43834 Revert "Automatic changelog generation for PR #8738 [ci skip]"
This reverts commit f3712660ce.
2019-06-28 02:33:23 -04:00