Commit Graph

431 Commits

Author SHA1 Message Date
Fermi
27aad8f117 Quick in case. 2019-07-02 22:42:07 +01:00
Thalpy
3c8025c477 Moving computers 2019-07-01 13:56:37 +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
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
Thalpy
4b7ac0be79 More fun ssblackbox tallies. 2019-06-28 16:50:48 +01:00
Thalpy
a2a5bbdb11 Found the "the floor" message admin! 2019-06-26 19:40:46 +01:00
Fermi
afe43070a0 Improved logging and renamed buffer IDs 2019-06-26 12:20:10 +01:00
Fermi
4145b0f256 Hotfix for egregious oversights. 2019-06-25 07:22:20 +01:00
Fermi
8605d3a246 Found a pH overflow. 2019-06-24 15:06:18 +01:00
Fermi
10109d0fe5 Merge branch 'pr/18' 2019-06-23 19:15:07 +01:00
Fermi
8992dbfa4d Commented out hypnoquirk and edited it so that it functions differently 2019-06-23 18:59:15 +01:00
Ghom
d4a13077ff ports in "Adds radial menu to arm-mounted implants" (#8733) 2019-06-23 06:01:09 -07:00
Ghom
d21e483abf Ports "Disembowelment now only works if you are dead/in critical" (#8671) 2019-06-23 05:59:50 -07:00
Fermi
7c19f5e0fa Forgot to comment out hypnoquirk. 2019-06-23 13:06:45 +01:00
Sishen
a2a440a92c golem gang golem gang golem gang golem gang 2019-06-23 04:27:50 -04:00
Fermi
537161dd01 Lil flavour tweaks. 2019-06-23 03:22:54 +01:00
Fermi
21c17813b8 Guess who should've compile tested! 2019-06-23 01:20:11 +01:00
Fermi
59b6d85c4e Few phrasing and span editing fixes. 2019-06-22 21:59:20 +01:00
Fermi
f096e8440a Finally fixed the vocalchord button 2019-06-22 21:00:20 +01:00
Fermi
1f5a7c0a25 Added velvet styling 2019-06-22 13:31:55 +01:00
Fermi
226dbe7804 Fixed blank sprite for velvet chord organ 2019-06-22 13:09:18 +01:00
Fermi
d2685be3f6 Split custom echo code into it's own call to reduce overhead. 2019-06-22 12:18:38 +01:00
Fermi
713d849c03 Merge remote-tracking branch 'upstream/master' 2019-06-19 21:02:30 +01:00
Fermi
02de745519 Merge branch 'Wheelchairs' of https://github.com/Thalpy/Citadel-Station-13 into Wheelchairs 2019-06-17 12:02:56 +01:00
Fermi
2681a8f7a9 Updates has_trait to HAS_TRAIT 2019-06-17 12:02:39 +01:00
Thalpy
98fc55e9f8 Merge branch 'master' into Wheelchairs 2019-06-16 17:33:57 +01:00
Fermi
7a66039f0c Fixing merge errors.
Testmerge ready.
2019-06-14 21:55:17 +01:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
Fermi
b4beb006f9 More fixes. 2019-06-14 15:43:48 +01:00
Fermi
d7cffadc13 Fixes 2019-06-14 13:43:57 +01:00
Fermi
54985c05d9 Confused about bitgates. 2019-06-13 07:11:29 +01:00
Fermi
0f5d47c03f Velvet speech reconfig. 2019-06-13 06:51:11 +01:00
Fermi
aa7805eaa4 Fixes. 2019-06-13 06:35:12 +01:00
Fermi
378af882d3 Ramping up to logging and a few more fixes. 2019-06-13 05:51:28 +01:00
Fermi
026f29ba46 Comments and logs. 2019-06-13 04:31:15 +01:00
Fermi
a3aa0408a3 Tongue 2019-06-13 03:37:15 +01:00
Fermi
c3892db433 Liver and lungs. 2019-06-13 03:34:33 +01:00
SkullyRoberts
e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29
Moves traits to datums and turn the accessors into defines
2019-06-08 01:22:16 -07:00
deathride58
aa53cc9ea9 Merge branch 'master' into fuckatmos 2019-06-07 04:38:47 -04:00
Fermi
05067463c5 Missed a comment. 2019-06-06 23:02:14 +01:00
Fermi
83666abfea Small text edits and tightening up of self MKU OD. 2019-06-06 22:56:59 +01:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Poojawa
27ef3ce281 Without this, everyone is broken 2019-06-05 08:10:20 -05:00
Poojawa
a2b4f4261c Fixes missing hands and marking overlap
cleans up the code a bit too. Improves female chest sprites.
2019-06-05 02:33:25 -05:00
Poojawa
b053fe3c86 Probably fixes synth hand issues 2019-06-04 23:36:58 -05:00