lolman360
|
b02ffa2e2d
|
Update inhand_holder.dm
|
2019-12-21 12:40:41 +11:00 |
|
r4d6
|
efdded7e48
|
Remove extra indentations
|
2019-12-20 18:38:47 -05:00 |
|
r4d6
|
bc70bc3882
|
Fix the nose boop.
|
2019-12-20 18:10:02 -05:00 |
|
Putnam
|
ef360838da
|
errors
|
2019-12-20 14:50:08 -08:00 |
|
Putnam
|
c810145fc1
|
also adds aphrodisiacs, slaps, all hypno as prefs
|
2019-12-20 14:47:09 -08:00 |
|
Ghom
|
6d824c99cf
|
Merge pull request #10051 from kappa-sama/patch-9
puts our legion more up to date with tg's
|
2019-12-20 14:25:09 +01:00 |
|
lolman360
|
6188ec034d
|
h
|
2019-12-20 16:10:13 +11:00 |
|
kevinz000
|
0feb54bf70
|
Update mob.dm
|
2019-12-19 17:54:01 -07:00 |
|
kevinz000
|
2f78c0a5db
|
Update mob.dm
|
2019-12-19 17:51:23 -07:00 |
|
Lin
|
42d8228c75
|
Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
|
2019-12-19 23:03:48 +00:00 |
|
Putnam
|
f2b46f0951
|
ROBUST OPTING MECHANICS
|
2019-12-19 11:14:02 -08:00 |
|
Ghommie
|
a46982efe3
|
F
|
2019-12-19 17:40:22 +01:00 |
|
Ghommie
|
fb2b259d92
|
Ports "Refactors can_see_reagents"
|
2019-12-19 17:17:18 +01:00 |
|
Ghommie
|
871a1aebdc
|
Hello darkness my old friend.
|
2019-12-19 13:56:00 +01:00 |
|
kevinz000
|
23f7815c52
|
Merge pull request #10204 from r4d6/patch-2
Port boops and handshakes
|
2019-12-19 04:01:52 -07:00 |
|
kevinz000
|
dcca9eb0d6
|
Merge pull request #10223 from BlackMajor/Yeehaw
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
|
2019-12-19 03:24:36 -07:00 |
|
lolman360
|
e8dc9480b0
|
AAAAAAAAAAAAAAAAAAAA
|
2019-12-19 18:30:38 +11:00 |
|
lolman360
|
d8f0e983f1
|
lolman acctually knows how the stuff work
|
2019-12-19 18:24:24 +11:00 |
|
lolman360
|
8fc095d63e
|
Update carbon.dm
|
2019-12-19 17:29:35 +11:00 |
|
Ghommie
|
ba851d55b6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit456
|
2019-12-18 19:42:41 +01:00 |
|
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 |
|