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 |
|
kevinz000
|
fbbfb02364
|
Merge pull request #8681 from Ghommie/Ghommie-cit64
Fixes vape and its sprites
|
2019-06-28 20:36:43 -07: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 |
|
kevinz000
|
a6caf4c63f
|
Merge pull request #8729 from Ghommie/Ghommie-cit79
Ports "Removes SSreligion"
|
2019-06-28 20:30:44 -07:00 |
|
kevinz000
|
7e1522b76b
|
Merge pull request #8581 from Ghommie/Ghommie-cit42
[Ready]Reskinnable PDAs.
|
2019-06-28 20:30:05 -07:00 |
|
Thalpy
|
b6309d5a31
|
Fixes explosion bug, tweaks hypo and fiddles pH.
|
2019-06-29 02:47:32 +01: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
deathride58
|
d979dfef59
|
Merge pull request #8738 from Ghommie/Ghommie-cit86
porting pizza fixes.
|
2019-06-28 00:53:23 -04:00 |
|
deathride58
|
8f168727c5
|
Merge pull request #8730 from Ghommie/Ghommie-cit80
Port in alt click to eject beaker and swapping beakers for chem machines, grinder radial menu.
|
2019-06-28 00:52:59 -04:00 |
|
deathride58
|
fb66d382fa
|
Merge pull request #8727 from Ghommie/Ghommie-cit78
Porting in the "Mediborg's Amputation Adventure" and Minesweeper arcades.
|
2019-06-28 00:47:09 -04:00 |
|
deathride58
|
3cd5b1d180
|
Merge pull request #8741 from Ghommie/Ghommie-cit88
ports "Stockings"
|
2019-06-28 00:38:27 -04:00 |
|
deathride58
|
2ed69c8b46
|
Merge pull request #8753 from Sishen1542/siliconmanbad
[PORT] Non-station AI can no longer interact off their z-level.
|
2019-06-28 00:29:32 -04:00 |
|
deathride58
|
720d4ee4c8
|
Merge pull request #8745 from Sishen1542/CASfix
Port of tg pull #44158, the fix of Cards Against Space!
|
2019-06-28 00:25:32 -04:00 |
|
deathride58
|
db6e8ecd4c
|
Merge pull request #8755 from Poojawa/the-balls-should-be-inert
Fixes errant ball behaviour
|
2019-06-28 00:23:37 -04:00 |
|
deathride58
|
1e3cc6d23e
|
Merge pull request #8764 from Trilbyspaceclone/patch-189
Allows shoulder holster to hold cap gun and mini-eguns
|
2019-06-28 00:11:09 -04:00 |
|
deathride58
|
229c7c75f2
|
Merge pull request #8766 from Ghommie/Ghommie-cit92
Fixing "You can Alt click paper with TK to teleport it to you."
|
2019-06-28 00:08:27 -04:00 |
|
Trilbyspaceclone
|
227dd82daa
|
just adrinals
|
2019-06-27 17:57:58 -04:00 |
|
Ghommie
|
a90ef6faa3
|
and it's gone.
|
2019-06-27 15:06:04 +02:00 |
|
Ghommie
|
d7028b0059
|
Fixes "Bubbles ate my Cohiba Robusto!"
|
2019-06-27 05:32:08 +02:00 |
|
Ghommie
|
f118edad1d
|
Fixing "You can Alt click paper with TK to teleport it to you."
|
2019-06-27 04:42:14 +02:00 |
|
Trilbyspaceclone
|
6ad0a0ba0d
|
Update belt.dm
|
2019-06-26 20:14:05 -04:00 |
|
Trilbyspaceclone
|
6b173432b2
|
Update belt.dm
|
2019-06-26 20:09:37 -04:00 |
|
TrilbySpaceClone
|
9cab7b960c
|
web-editless
|
2019-06-26 18:10:13 -04:00 |
|
Thalpy
|
a2a5bbdb11
|
Found the "the floor" message admin!
|
2019-06-26 19:40:46 +01:00 |
|
Poojawa
|
00a630abe5
|
Fixes errant ball behaviour
|
2019-06-26 07:42:02 -05:00 |
|
Fermi
|
afe43070a0
|
Improved logging and renamed buffer IDs
|
2019-06-26 12:20:10 +01:00 |
|
Fermi
|
fbf54cd560
|
Ninja fix.
|
2019-06-26 12:01:26 +01:00 |
|
Sishen
|
65d05f7df0
|
Goodbye golem AI
|
2019-06-26 00:08:42 -04:00 |
|
Fermi
|
fa9ae6d2e7
|
Feedback regarding trait
|
2019-06-25 23:52:38 +01:00 |
|
Ghommie
|
61a6d899d2
|
Should be ready.
|
2019-06-26 00:21:06 +02:00 |
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|