 Thalpy
|
e09f189895
|
WELCOME TO PH'S HELL RIDE
|
2019-06-30 01:56:10 +01:00 |
|
|
Ghommie
|
dc20b605fb
|
Fixing some emergency pod storage refactor fuck ups.
|
2019-06-30 00:40:39 +02:00 |
|
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
Sishen
|
3aaed75a95
|
Update smelting_designs.dm
|
2019-06-29 04:49:29 -04: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 |
|
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
|
Sishen
|
97241cd1e8
|
jetpacks, take 2
|
2019-06-29 00:29:49 -04:00 |
|
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02: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 |
|
|
Trilbyspaceclone
|
75fa9d633c
|
Update autolathe_designs_tools.dm
|
2019-06-28 21:56:17 -04:00 |
|
|
Thalpy
|
b6309d5a31
|
Fixes explosion bug, tweaks hypo and fiddles pH.
|
2019-06-29 02:47:32 +01:00 |
|
|
Ghommie
|
06ce8c6245
|
I thought I commited these already. turns out I were wrong.
|
2019-06-28 23:30:19 +02:00 |
|
|
Ghommie
|
d93e63af53
|
we just want the trauma to be niche, not unachievable.
|
2019-06-28 23:21:10 +02:00 |
|
|
Ghommie
|
3291b9c47a
|
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-06-28 23:17:12 +02: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 |
|
|
Ghommie
|
f210e79f3f
|
Slight tweaks to the crew monitor indexing.
|
2019-06-28 19:47:19 +02:00 |
|
|
Sishen
|
ccf64fe9c9
|
fix per ghoms request
|
2019-06-28 13:16:52 -04: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 |
|
|
Sishen
|
6590b07b32
|
Update runes.dm
|
2019-06-28 12:01:00 -04: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 |
|
|
Ghommie
|
513f0af0fa
|
turns out the curator cartridge already had an (unused) sprite.
|
2019-06-28 17:14:57 +02:00 |
|
|
Sishen
|
1459ada045
|
adds customization options for podweak
|
2019-06-28 10:22:09 -04: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 |
|
|
kevinz000
|
33a972529c
|
Update wheelchair.dm
|
2019-06-28 04:42:55 -07:00 |
|
|
Arturlang
|
442c21fdba
|
For the actual deflecting!
|
2019-06-28 11:41:01 +03:00 |
|
|
Arturlang
|
69a62314e9
|
Defines so carp reroutes the deflects
|
2019-06-28 11:37:12 +03:00 |
|
|
Arturlang
|
eb8133cf3b
|
Defines var
Filthy webedits, i know.
|
2019-06-28 11:35:00 +03:00 |
|
|
Arturlang
|
2ecaa57a98
|
Description so people know it exists
|
2019-06-28 11:28:37 +03:00 |
|
|
Arturlang
|
a9d4f53728
|
Alt-Keys now let you strafe! Wow!
|
2019-06-28 11:27:35 +03:00 |
|
|
Arturlang
|
8160da6a6a
|
Reviewer suggestions
|
2019-06-28 11:06:33 +03: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 |
|