Commit Graph

23530 Commits

Author SHA1 Message Date
Timothy Teakettle
238af723bb makes insects specifically insects not flies 2020-07-25 18:14:12 +01:00
timothyteakettle
060b3dcd04 im sorry moths 2020-07-24 03:27:44 +01:00
Timothy Teakettle
fa489efa79 spellcheck 2020-07-24 02:39:41 +01:00
Timothy Teakettle
ed8723e74e Merge branch 'master' into species-are-dumb 2020-07-23 22:15:10 +01:00
Timothy Teakettle
f4933c4177 let them scar 2020-07-23 22:14:41 +01:00
Timothy Teakettle
8f8aaee36c fixes up drinks 2020-07-23 22:09:14 +01:00
Timothy Teakettle
450509347a tidy species more 2020-07-23 21:57:32 +01:00
Lin
e14f5ff576 Merge pull request #12832 from Citadel-Station-13/overlays-experimental
do we want (probably) free memory savings trick question yes we do
2020-07-23 13:41:36 -05:00
Lin
1f7488aad2 Merge pull request #12821 from Citadel-Station-13/silicons-patch-36
Increases projectile speed across the board by around 40-45%
2020-07-23 13:41:17 -05:00
Lin
fbfd6286b5 Merge pull request #12849 from Citadel-Station-13/silicons-patch-43
raises max keybind command length to 32 so controller users don't get kicked
2020-07-23 13:30:31 -05:00
Lin
d112e00c11 Merge pull request #12837 from silicons/apcs
see unoptimized code doesn't matter much until iceboxstation rolls and now said unoptimized code is looping across probably a few tens of thousands of objects and now we have a problem
2020-07-23 13:30:00 -05:00
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
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
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
9222933d77 Merge pull request #12816 from timothyteakettle/wound-port
ports part 1 of tg wounds
2020-07-23 10:25:25 -07:00
Timothy Teakettle
f5ac0b5762 some fixes 2020-07-23 18:10:46 +01:00
timothyteakettle
a5945d3dc2 slight zombie tweaking 2020-07-23 01:09:09 +01:00
silicons
66e4d98141 Update datacore.dm 2020-07-22 16:59:51 -07:00
silicons
efb4d19a40 Merge pull request #12855 from DeltaFire15/AAAAAAAA
Unfucks the monophobia traits (Aswell as traits in general) with this one simple trick
2020-07-22 11:41:48 -07:00
silicons
e0e2cd561a Update revive.dm 2020-07-22 11:38:26 -07:00
timothyteakettle
0ccbe0b793 it works 2020-07-22 14:49:22 +01: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
a22c6b21c4 Merge pull request #12847 from Putnam3145/faster-chat
Chat queue optimization
2020-07-22 02:30:31 -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
zerothebigboy
7870d90de3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radiationsuitsareugly
# Conflicts:
#	icons/mob/clothing/hands.dmi
#	icons/mob/clothing/head.dmi
#	icons/obj/clothing/gloves.dmi
#	icons/obj/clothing/hats.dmi
2020-07-22 01:03:55 -04:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
Sneakyrat6
402f13ce1b Fixes dressers not giving you undies 2020-07-21 20:33:58 -05:00
Sneakyrat6
2968963f19 Allows Photos to be Burned 2020-07-21 20:20:51 -05:00
zerothebigboy
75c87077ec a 2020-07-21 17:22:35 -04:00
Timothy Teakettle
aea268548c some fixes 2020-07-21 19:54:42 +01:00
DeltaFire
73925501ae I will now proceed to scream internally
Tabby boi bad
2020-07-21 20:13:30 +02:00
Zandario
bbf38c9898 tipes 2020-07-21 11:22:21 -05:00
zerothebigboy
7b35c5fd9d a 2020-07-21 02:30:32 -04:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons
5347b9f6a5 Update keybindings.dm 2020-07-20 21:33:03 -07:00