Putnam3145 and GitHub
7a6541936c
Merge pull request #10111 from kappa-sama/patch-11
...
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
2019-12-17 11:38:35 -08:00
Putnam3145 and GitHub
0adcb900c1
Merge pull request #10155 from Seris02/windowfix
...
adds some distance checks to some things
2019-12-17 11:34:13 -08:00
Putnam3145 and GitHub
634154e7cf
Merge pull request #10157 from Ghommie/Ghommie-cit452
...
Ports "Fixes powernet avail checks"
2019-12-17 11:33:33 -08:00
Putnam3145 and GitHub
10f0fa6868
Merge pull request #10203 from DeltaFire15/mechaccess
...
Nukies and deathsquaddies can now finally fix their mechs internal fires
2019-12-17 11:32:56 -08:00
Putnam3145 and GitHub
670141edf7
Merge pull request #10209 from Ghommie/Ghommie-cit470
...
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-17 11:26:36 -08:00
Trilbyspaceclone and GitHub
47df4f452d
Update drink_reagents.dm
2019-12-17 14:26:21 -05:00
Putnam3145 and GitHub
5945f30523
Merge pull request #10225 from Ghommie/Ghommie-cit475
...
Two slimepeople fixes.
2019-12-17 11:22:30 -08:00
BlackMajor and GitHub
95c0eddc2a
Merge pull request #10072 from Useroth/new-tg-plants
...
Ported bamboo stuff from tg.
2019-12-18 01:02:29 +13:00
Ghommie
f2cf146255
Two slimepeople fixes.
2019-12-17 12:49:04 +01:00
BlackMajor
5245898c25
whoops
2019-12-17 23:46:15 +13:00
BlackMajor
03d2e9eb6d
Compress secK9
2019-12-17 23:32:51 +13:00
Ghommie
3f06661de5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453
2019-12-17 03:34:11 +01:00
Ghommie
6b7dcbceb0
Porting a few martial art code updates.
2019-12-17 03:19:07 +01:00
Lin and GitHub
6f70ba1477
Merge pull request #10181 from Ghommie/Ghommie-cit463
...
Fixing a few pill bottle issues with the ChemMaster.
2019-12-17 01:08:27 +00:00
Lin and GitHub
237fbaa02d
Merge pull request #10180 from Ghommie/Ghommie-cit462
...
[s] virtual reality component improvements, fixes and documentation.
2019-12-17 01:05:10 +00:00
Trilbyspaceclone and GitHub
c036c2c835
Update drink_reagents.dm
2019-12-16 19:05:16 -05:00
Ghommie
1c3682cd15
Brings carbon action intent hotkeys down to living.
2019-12-17 00:03:39 +01:00
fe1576583c
Update code/modules/vending/cola.dm
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2019-12-16 15:01:16 -05:00
Putnam3145 and GitHub
6365a430cc
Merge pull request #10208 from Ghommie/Ghommie-cit469
...
Fixes AI being unable to talk through the holopad.
2019-12-16 10:57:26 -08:00
kevinz000 and GitHub
d9cd90c3c5
Update supply.dm
2019-12-16 11:31:03 -07:00
Ghommie
93fbc17428
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
2019-12-16 17:58:50 +01:00
Ghommie
9c5a66af67
Fixes AI being unable to talk through the holopad.
2019-12-16 15:58:10 +01:00
51a17dff94
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:42 -05:00
c291511ab6
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:35 -05:00
bfbb6231a5
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:28 -05:00
2d488bee52
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:21 -05:00
3e86e2207e
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:23:07 -05:00
21b7fb0759
Commit suggestions
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 09:22:58 -05:00
r4d6 and GitHub
7142894ce7
Make the boop louder.
2019-12-16 09:02:01 -05:00
r4d6 and GitHub
2e4187b7c8
Add a boop sound effect
2019-12-16 08:56:51 -05:00
Ghommie
b0e8fb42cd
AAAAA
2019-12-16 14:00:14 +01:00
a4d6911324
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:29 -05:00
13aaebcd22
Update code/modules/mob/living/carbon/carbon_defense.dm
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-12-16 07:48:22 -05:00
r4d6 and GitHub
e8d43dac87
Port boops and handshakes
2019-12-16 06:27:18 -05:00
Useroth
8151a1f3ff
Merged master into this branch.
2019-12-16 12:06:30 +01:00
DeltaFire
05497bb392
Changes required to enable for maintenance protocols
...
All combat mechs that are special get their internals_access increased so the pilots of the deathsquad / nuke team can fix up their mechs without having to steal a robotics ID. Also removes engineering from being able to access mech internals, seems weird to have if only robotics is allowed to handle mechs, probably remnant of engineering robotics?
2019-12-16 11:25:11 +01:00
kappa-sama and GitHub
9f71900052
oop
2019-12-15 23:29:01 -05:00
kappa-sama and GitHub
b6c9c73372
this cannot go wrong
2019-12-15 23:28:17 -05:00
Lin and GitHub
b54c8a6a2a
Merge pull request #9736 from Citadel-Station-13/kevinz000-patch-113
...
I want to have a word with whoever wrote the original antagonist reputation proc
2019-12-16 03:20:38 +00:00
kevinz000 and GitHub
b4bd2cbb5c
Update preferences.dm
2019-12-15 20:20:04 -07:00
kevinz000 and GitHub
ba7a3f5fd2
Merge pull request #9971 from Xantholne/xantholne-christmas01
...
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
Ghommie
843f4ed0da
FLAK
2019-12-16 02:44:58 +01:00
Ghommie
fb6b01a4ae
testing, further improvements. Tired.
2019-12-16 02:29:53 +01:00
BlackMajor and GitHub
74cc1ec547
Merge pull request #10177 from BlackMajor/FIST
...
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
loginsandylogout and GitHub
491958475b
fixed
2019-12-15 18:48:50 -06:00
Ghommie
6a5a098458
Fixing the blood bank generator.
2019-12-16 01:43:21 +01:00
kevinz000 and GitHub
0190054c97
Update carbon.dm
2019-12-15 17:08:41 -07:00
kevinz000 and GitHub
e08b5b814f
Update lighting.dm
2019-12-15 17:04:23 -07:00
kevinz000 and GitHub
e496b7c397
Update eyes.dm
2019-12-15 17:02:43 -07:00
kevinz000 and GitHub
ce5c42f323
Update good.dm
2019-12-15 17:02:00 -07:00
