 silicons
|
db24df58a0
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:36:46 -07:00 |
|
|
silicons
|
9f66163d4f
|
Merge pull request #12828 from Owai-Seek/foodport-p2-7/12/20
Ports several food sprites/foods from Baystation/Citadel RP
|
2020-07-23 10:35:30 -07:00 |
|
|
silicons
|
ec72015f4f
|
Merge pull request #12809 from BlackMajor/borgo
Gripper brained. The medborg can do chemistry now, oh no.
|
2020-07-23 10:35:16 -07:00 |
|
|
silicons
|
55754023ba
|
Update gas_mixture.dm
|
2020-07-23 10:32:21 -07:00 |
|
|
Timothy Teakettle
|
41cd02152a
|
tidy up
|
2020-07-23 18:30:25 +01:00 |
|
|
silicons
|
dad3d38933
|
Merge pull request #12869 from timothyteakettle/zombies-rework
the very much needed zombie buffs
|
2020-07-23 10:29:43 -07:00 |
|
|
silicons
|
aeb6688bc7
|
Merge pull request #12860 from Sneakyrat6/burnablePhoto
Allows Photos to be Burned
|
2020-07-23 10:29:10 -07:00 |
|
|
silicons
|
ffd44b78ba
|
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
|
2020-07-23 10:26:03 -07:00 |
|
|
silicons
|
9222933d77
|
Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
|
2020-07-23 10:25:25 -07:00 |
|
|
silicons
|
4373e2b452
|
done
|
2020-07-23 10:18:10 -07:00 |
|
|
silicons
|
89a1fa544e
|
fixes
|
2020-07-23 10:12:34 -07:00 |
|
|
Timothy Teakettle
|
f5ac0b5762
|
some fixes
|
2020-07-23 18:10:46 +01:00 |
|
|
Keate Senior
|
fafde35ee2
|
Fixes the Arks looping issue, and gives Ratvar new words when fighting
Also removes the grace period variable since the ark activates immediately now /shrug
|
2020-07-23 12:59:40 -04:00 |
|
|
silicons
|
2eb6f0467d
|
fix guns
|
2020-07-23 09:56:38 -07:00 |
|
|
silicons
|
38a9e89687
|
ok bet
|
2020-07-23 09:49:56 -07:00 |
|
|
silicons
|
0858af4b85
|
ok
|
2020-07-23 09:43:43 -07:00 |
|
|
silicons
|
99eb77c052
|
fix
|
2020-07-23 09:32:28 -07:00 |
|
|
silicons
|
703afec454
|
ok
|
2020-07-23 08:57:15 -07:00 |
|
|
silicons
|
8a9d806d04
|
Update client_procs.dm
|
2020-07-23 08:12:48 -07:00 |
|
|
Timothy Teakettle
|
2290823ace
|
fixes hat removal
|
2020-07-23 14:40:36 +01:00 |
|
|
Keate Senior
|
7f652cf338
|
updates the UI so it works with TGUI3
|
2020-07-23 06:38:47 -04:00 |
|
|
silicons
|
21d57eeeac
|
sigh
|
2020-07-23 00:27:45 -07:00 |
|
|
silicons
|
3a38344a04
|
fix
|
2020-07-23 00:25:06 -07:00 |
|
|
silicons
|
910290edcf
|
buffers
|
2020-07-23 00:22:33 -07:00 |
|
|
silicons
|
76f885e1a6
|
ok
|
2020-07-23 00:16:43 -07:00 |
|
|
silicons
|
697cef017b
|
Update living.dm
|
2020-07-22 23:43:57 -07:00 |
|
|
silicons
|
d976e2186c
|
Merge branch 'master' into drag
|
2020-07-22 23:43:09 -07:00 |
|
|
timothyteakettle
|
a5945d3dc2
|
slight zombie tweaking
|
2020-07-23 01:09:09 +01:00 |
|
|
silicons
|
e0e2cd561a
|
Update revive.dm
|
2020-07-22 11:38:26 -07:00 |
|
|
timothyteakettle
|
a155f24253
|
let santa hat go on
|
2020-07-22 16:53:51 +01:00 |
|
|
timothyteakettle
|
a607130e3c
|
please compile
|
2020-07-22 16:24:35 +01:00 |
|
|
timothyteakettle
|
ed1e8c4221
|
support for masks
|
2020-07-22 15:43:58 +01:00 |
|
|
timothyteakettle
|
0ccbe0b793
|
it works
|
2020-07-22 14:49:22 +01:00 |
|
|
lolman360
|
6b23138b31
|
l
|
2020-07-22 22:20:42 +10:00 |
|
|
silicons
|
60a25981bc
|
Merge pull request #12835 from kappa-sama/patch-36
might fix necropolis chests turning up completely empty
|
2020-07-22 02:31:21 -07:00 |
|
|
silicons
|
0acf7b82d5
|
Update revive.dm
|
2020-07-22 02:20:10 -07:00 |
|
|
silicons
|
919edfa2fd
|
Update revive.dm
|
2020-07-22 02:11:20 -07:00 |
|
|
silicons
|
30e7483e89
|
Update absorb.dm
|
2020-07-22 02:10:24 -07:00 |
|
|
silicons
|
9fc669b4ea
|
Update changeling.dm
|
2020-07-22 02:09:49 -07:00 |
|
|
silicons
|
5f7ec688f2
|
Update clown.dm
|
2020-07-21 22:13:21 -07:00 |
|
|
lolman360
|
0854702762
|
whoops
|
2020-07-22 12:45:42 +10:00 |
|
|
lolman360
|
17d1fd0692
|
fixes
|
2020-07-22 12:42:46 +10:00 |
|
|
silicons
|
3ed854bdb3
|
Update gun.dm
|
2020-07-21 19:38:38 -07:00 |
|
|
silicons
|
3a83c526b6
|
Update gun.dm
|
2020-07-21 19:36:37 -07:00 |
|
|
Letter N
|
49941ea2e6
|
code, still not enabled
|
2020-07-22 10:27:37 +08:00 |
|
|
silicons
|
744b6d6b48
|
Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
|
2020-07-21 19:20:52 -07:00 |
|
|
lolman360
|
c07e5d544b
|
wweeee
|
2020-07-22 11:27:26 +10:00 |
|
|
Sneakyrat6
|
2968963f19
|
Allows Photos to be Burned
|
2020-07-21 20:20:51 -05:00 |
|
|
lolman360
|
0f1aa3c0ca
|
'lolman? did you test your code?'
no i did not ms. kevinz
|
2020-07-22 10:49:56 +10:00 |
|
|
timothyteakettle
|
6a4264085c
|
woops 2: electric boogaloo
|
2020-07-22 00:17:03 +01:00 |
|