 Lin
|
02add89513
|
Merge pull request #12846 from Citadel-Station-13/silicons-patch-42
it would be real lovely if the server didn't nuke 40 people's characters because the configuration couldn't be loaded because i really hate dll memes
|
2020-07-23 13:29:18 -05:00 |
|
|
Lin
|
6fca9af0ed
|
Merge pull request #12848 from silicons/morecolors
species customization now allows 16 million colors instead of 4 thousand
|
2020-07-23 13:28:50 -05:00 |
|
|
Iatots
|
e6dd213a2a
|
Update recipes_misc.dm
|
2020-07-23 20:26:11 +02:00 |
|
|
Lin
|
ddc10e625e
|
Merge pull request #12806 from Citadel-Station-13/silicons-patch-33
adds some more virtual data returns for gas mixture vv (temp, volume, pressure, heat capacity, energy)
|
2020-07-23 13:20:29 -05:00 |
|
|
Lin
|
7352e21877
|
Merge pull request #12844 from Citadel-Station-13/silicons-patch-41
fixes traitor jobban link
|
2020-07-23 13:19:25 -05:00 |
|
|
Lin
|
69c3d4f24a
|
Merge pull request #12864 from Citadel-Station-13/silicons-patch-45
regarding changelings
|
2020-07-23 13:18:55 -05:00 |
|
|
Lin
|
cdd509479e
|
Merge pull request #12868 from Citadel-Station-13/silicons-patch-46
regarding manifest injections
|
2020-07-23 13:18:35 -05:00 |
|
|
silicons
|
cd67be32e0
|
Update wishgranter.dm
|
2020-07-23 11:12:09 -07:00 |
|
|
Iatots
|
80f2766314
|
Update plushes.dm
|
2020-07-23 20:11:29 +02:00 |
|
|
Timothy Teakettle
|
5463673831
|
fuck
|
2020-07-23 19:02:50 +01:00 |
|
|
silicons
|
21143ade21
|
eyeroll
|
2020-07-23 11:01:33 -07:00 |
|
|
Iatots
|
967dfb7bc4
|
Update other_reagents.dm
|
2020-07-23 19:59:08 +02:00 |
|
|
Timothy Teakettle
|
673188bc7e
|
please show the hat
|
2020-07-23 18:57:24 +01:00 |
|
|
Iatots
|
9d89158fda
|
Update cuts.dm
|
2020-07-23 19:48:41 +02:00 |
|
|
Timothy Teakettle
|
b18356c95d
|
requested changes
|
2020-07-23 18:47:34 +01:00 |
|
|
Iatots
|
3dac7e4b43
|
Update generic_positive_events.dm
|
2020-07-23 19:44:02 +02:00 |
|
|
silicons
|
da4e208f94
|
ok
|
2020-07-23 10:40:12 -07:00 |
|
|
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
|
11a4dfd20b
|
Merge pull request #12861 from Sneakyrat6/dresserFix
Fixes dressers not giving you undies
|
2020-07-23 10:28:54 -07:00 |
|
|
silicons
|
ce87d3e8c5
|
Merge pull request #12856 from zeroisthebiggay/radiationsuitsareugly
ports tg radiation suits and also makes syndiekrav gloves actually visually distinct
|
2020-07-23 10:28:44 -07:00 |
|
|
silicons
|
d520eaa0ad
|
Merge pull request #12854 from Zandario/tipes
tipes
|
2020-07-23 10:26:55 -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
|
e425ef7d68
|
fix
|
2020-07-23 09:33:32 -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
|
65898bb7f6
|
inf loop
|
2020-07-23 00:32:05 -07: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 |
|