Ghommie
|
f945577655
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320
|
2019-12-18 19:20:38 +01:00 |
|
kevinz000
|
5a2ef22633
|
buckle others
|
2019-12-17 21:03:37 -07:00 |
|
kevinz000
|
cb78fc9188
|
pai_buckle
|
2019-12-17 20:58:11 -07:00 |
|
kevinz000
|
fdb4296adc
|
whew
|
2019-12-17 20:49:58 -07:00 |
|
Trilbyspaceclone
|
0f5c8db456
|
Merge branch 'master' into donut
|
2019-12-17 15:12:51 -05:00 |
|
Putnam3145
|
6b8f9427d0
|
Merge pull request #10153 from Linzolle/fireman-clarity
make unable to carry fireman message more clear when unable to carry non-humans
|
2019-12-17 12:09:08 -08:00 |
|
Putnam3145
|
b8c5290011
|
Merge pull request #10026 from Linzolle/neck-slice
Neck slice
|
2019-12-17 11:58:00 -08:00 |
|
Putnam3145
|
ed44b3130c
|
Merge pull request #10172 from Ghommie/Ghommie-cit460
Porting several quirks code updates.
|
2019-12-17 11:51:03 -08:00 |
|
Putnam3145
|
7017ab243b
|
Merge pull request #10216 from Ghommie/Ghommie-cit474
Porting a few martial art code updates.
|
2019-12-17 11:47:19 -08:00 |
|
Putnam3145
|
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
|
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 |
|
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
|
6b7dcbceb0
|
Porting a few martial art code updates.
|
2019-12-17 03:19:07 +01:00 |
|
Lin
|
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 |
|
Ghommie
|
5bf252a58c
|
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2019-12-17 01:57:56 +01:00 |
|
kevinz000
|
2b254653b6
|
typepath
|
2019-12-16 16:27:00 -07:00 |
|
kevinz000
|
4fa744e78d
|
radio short
|
2019-12-16 15:42:37 -07:00 |
|
kevinz000
|
2c228571f3
|
nerfs
|
2019-12-16 15:39:22 -07:00 |
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
Putnam3145
|
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 |
|
Ghommie
|
447f416ca6
|
Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471
|
2019-12-16 19:10:07 +01:00 |
|
Ghommie
|
93fbc17428
|
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
|
2019-12-16 17:58:50 +01:00 |
|
kevinz000
|
aa14713fdd
|
nerfs
|
2019-12-16 08:12:49 -07:00 |
|
kevinz000
|
b3ad352a96
|
stuff
|
2019-12-16 08:10:41 -07:00 |
|
Ghommie
|
9c5a66af67
|
Fixes AI being unable to talk through the holopad.
|
2019-12-16 15:58:10 +01:00 |
|
r4d6
|
51a17dff94
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:42 -05:00 |
|
r4d6
|
c291511ab6
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:35 -05:00 |
|
r4d6
|
bfbb6231a5
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:28 -05:00 |
|
r4d6
|
2d488bee52
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:21 -05:00 |
|
r4d6
|
3e86e2207e
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:23:07 -05:00 |
|
r4d6
|
21b7fb0759
|
Commit suggestions
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
|
2019-12-16 09:22:58 -05:00 |
|
r4d6
|
7142894ce7
|
Make the boop louder.
|
2019-12-16 09:02:01 -05:00 |
|
r4d6
|
2e4187b7c8
|
Add a boop sound effect
|
2019-12-16 08:56:51 -05:00 |
|
r4d6
|
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 |
|
r4d6
|
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
|
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 |
|
kevinz000
|
f11ab5eb61
|
hm
|
2019-12-15 23:29:25 -07:00 |
|
kevinz000
|
80ffb13f06
|
bypass joblock
|
2019-12-15 23:24:43 -07:00 |
|
kevinz000
|
78e9b82eb6
|
trying too hard
|
2019-12-15 23:03:44 -07:00 |
|
kevinz000
|
57748fcdc8
|
changes
|
2019-12-15 22:28:41 -07:00 |
|
kevinz000
|
932bdfd325
|
kay
|
2019-12-15 21:57:22 -07:00 |
|
kevinz000
|
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 |
|
kevinz000
|
3b47949f82
|
haha fuck that's a lotta changes
|
2019-12-15 19:59:15 -07:00 |
|
kevinz000
|
5f27103641
|
god FUCK you icons
|
2019-12-15 17:30:30 -07:00 |
|
kevinz000
|
0190054c97
|
Update carbon.dm
|
2019-12-15 17:08:41 -07:00 |
|
Putnam3145
|
363380405e
|
Merge pull request #10198 from Ghommie/Ghommie-cit466
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-15 15:42:13 -08:00 |
|
Ghommie
|
22aba489e3
|
Fixes ranged syndicate mobs stormtrooper training: The port.
|
2019-12-16 00:21:28 +01:00 |
|