 Ghommie
|
5799ff402f
|
Progress.
|
2019-07-03 22:51:10 +02:00 |
|
|
kevinz000
|
bce4ce31ab
|
Merge pull request #8778 from Ghommie/Ghommie-cit97
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-07-03 13:47:04 -07:00 |
|
|
kevinz000
|
75f1dca544
|
Merge pull request #8773 from Sishen1542/podgang
Podweak now have all customization options.
|
2019-07-03 13:46:08 -07:00 |
|
|
kevinz000
|
10a584c71f
|
Merge pull request #8776 from Ghommie/Ghommie-cit96
Porting in donut fixes, beepsky smash and Neurotoxin reworks.
|
2019-07-03 13:45:02 -07:00 |
|
|
kevinz000
|
ab217e81e6
|
Merge pull request #8781 from Sishen1542/plasteel
Adds plasteel to medical and security techfabs.
|
2019-07-03 13:42:22 -07:00 |
|
|
Ghommie
|
adbf67b052
|
Purging old code,
forcing mind transfer on transform procs,
Fixing a slight fuck up null.ckey 👀
|
2019-07-03 20:01:49 +02:00 |
|
|
kevinz000
|
9654308a94
|
Merge pull request #8809 from Ghommie/Ghommie-cit103
Quickfixing latejoin ghost roles, I'm sorry.
|
2019-07-03 09:52:14 -07:00 |
|
|
kevinz000
|
948bba1274
|
Merge pull request #8799 from Trilbyspaceclone/Cargo_lewds
Adds Promiscuous Organs crate to cargo
|
2019-07-03 09:51:47 -07:00 |
|
|
kevinz000
|
0f0d5323a3
|
Merge pull request #8797 from Sishen1542/rotate-emitters
Emitters can be rotated instead of only flipped
|
2019-07-03 05:20:37 -07:00 |
|
|
kevinz000
|
8a4d7afca2
|
Update lungs.dm
|
2019-07-03 03:55:27 -07:00 |
|
|
Ghommie
|
1fd50cc15a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96
|
2019-07-03 04:52:57 +02:00 |
|
|
Ghommie
|
ffecca8c11
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-07-03 03:24:28 +02:00 |
|
|
Ghommie
|
c58efa64c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-03 02:36:23 +02:00 |
|
|
Fermi
|
5f72277549
|
Succumb tweak. Ready to merge.
|
2019-07-02 23:24:35 +01:00 |
|
|
Fermi
|
381e12f04a
|
Fixing message_admins.
|
2019-07-02 22:52:45 +01:00 |
|
|
Fermi
|
27aad8f117
|
Quick in case.
|
2019-07-02 22:42:07 +01:00 |
|
|
Fermi
|
946fbff999
|
+Yamerol, tweaked PE, tweaked CM3000, tweaked medpH.
|
2019-07-02 22:15:32 +01:00 |
|
|
Fermi
|
d83fe49556
|
+lewdchem pref on CC -EnthrallExpo from botany, tweaks messages on EExpo
|
2019-07-02 15:03:19 +01:00 |
|
|
Sishen
|
67a602fd79
|
hugboxed surgery, works for borgs
|
2019-07-02 06:26:07 -04:00 |
|
|
Fermi
|
d876b20a0b
|
Quickfix for botany and removed message_admins that I thought I pushed.
|
2019-07-01 22:32:42 +01:00 |
|
|
Ghommie
|
33687dc2bc
|
I'm an idiot, I need to pick an element within the list, not the list itself!!
|
2019-07-01 22:53:42 +02:00 |
|
|
Ghommie
|
d0a001f663
|
Quickfixing latejoin ghost roles, I'm sorry.
|
2019-07-01 22:47:51 +02:00 |
|
|
Fermi
|
326bae2109
|
pH? More like Pretty HARGH.
|
2019-07-01 21:04:17 +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 |
|
|
Ghommie
|
8c1e6ff66a
|
Thanks for pointing that out, lolman.
|
2019-07-01 09:24:35 +02:00 |
|
|
Thalpy
|
cf225f335a
|
Forgot to rename the box.
|
2019-07-01 00:18:35 +01:00 |
|
|
Ghommie
|
70dc9b9122
|
fomatting.
|
2019-06-30 22:37:48 +02:00 |
|
|
Sishen
|
f55ef6a755
|
Update thermomachine.dm
|
2019-06-30 16:10:54 -04:00 |
|
|
Ghommie
|
f39a5d2f6a
|
Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.
|
2019-06-30 21:53:33 +02:00 |
|
|
TrilbySpaceClone
|
9d6c930b2c
|
owo
Wat dis?
|
2019-06-30 15:47:45 -04:00 |
|
|
Sishen
|
2047d86095
|
Update emitter.dm
|
2019-06-30 15:33:34 -04:00 |
|
|
Thalpy
|
937d6467e6
|
Buncha fixes and QoL stuff. (pH, hypo, heater and dispencer_
|
2019-06-30 19:16:27 +01:00 |
|
|
Ghommie
|
831c91fce2
|
Fixes the uplink category indexing.
|
2019-06-30 17:43:34 +02:00 |
|
|
Ghommie
|
c569da5713
|
Fixes PDA skin preference not saving up.
|
2019-06-30 17:17:23 +02:00 |
|
|
kevinz000
|
4d39d28f74
|
Update output.dm
|
2019-06-30 03:55:03 -07:00 |
|
|
deathride58
|
4b83110db7
|
fuck copypasta; Fixes master not compiling. Stop blindly copy-pasting shit from other codebases without even so much as making sure it compiles. Holy fuck.
|
2019-06-30 05:02:51 -04:00 |
|
|
deathride58
|
1efd1b2634
|
oh, and lets add a length check real quick to make sure the sleeper actually has shit in it
|
2019-06-30 04:35:34 -04:00 |
|
|
deathride58
|
cb5ed2d2cd
|
Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar
|
2019-06-30 04:29:48 -04:00 |
|
|
kevinz000
|
09c8a45fe2
|
Merge pull request #8770 from Arturlang/Carp_Deflecting
Carp now deflects the bullets instead of making them dissapear.
|
2019-06-29 20:08:47 -07:00 |
|
|
Thalpy
|
538e0fad29
|
Oops
|
2019-06-30 02:06:30 +01:00 |
|
|
TrilbySpaceClone
|
688fabfffc
|
Honk
|
2019-06-29 21:03:38 -04: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 |
|
|
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 |
|
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02: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 |
|