silicons
90d3cff53f
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 11:53:59 -07:00
silicons
e4148fe4ad
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-29 01:11:11 -07:00
silicons
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
Lin
81a7542aa6
Merge pull request #12834 from silicons/clickcd_experimental
...
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
silicons
0152dcda65
fix
2020-07-28 13:24:45 -07:00
silicons
6c83beea02
Merge pull request #12937 from Ghommie/Ghommie-cit834
...
Fixing new bugs and stuff.
2020-07-28 10:46:17 -07:00
Ghommie
f1c242aadc
Fixing new bugs and stuff.
2020-07-27 14:16:01 +02:00
SiliconMain
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
SiliconMain
1a78098885
on second thought
2020-07-26 05:20:53 -05:00
SiliconMain
54ed22d17d
ye
2020-07-26 05:19:56 -05:00
SiliconMain
d1c3465d77
Update belt.dm
2020-07-26 04:28:18 -05: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
ffd44b78ba
Merge remote-tracking branch 'citadel/master' into clickcd_experimental
2020-07-23 10:26:03 -07:00
silicons
184e3992f3
fixes
2020-07-21 11:56:23 -07:00
silicons
f3efa19436
Merge remote-tracking branch 'citadel/master' into 12742
2020-07-21 11:25:26 -07:00
Timothy Teakettle
75a2035774
Merge branch 'master' into wound-port
2020-07-21 01:10:51 +01:00
silicons
7df369e5d7
Merge pull request #12811 from kappa-sama/patch-33
...
removes the 2 best weapons in the game from traitor uplink's 10tc surgery bag
2020-07-20 16:58:01 -07:00
silicons
267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
silicons
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
Chiirno
64d5bd0030
switches around messages
2020-07-19 21:38:44 -03:00
Winter Flare
e416a2377e
Merge branch 'master' into foodport-p2-7/12/20
2020-07-19 18:58:52 -04:00
Timothy Teakettle
1b99cb9201
everything has the bonesetter
2020-07-19 18:32:44 +01:00
Winter Flare
2effbf4db0
Fixes Spiral, and Cracker Box
2020-07-18 18:53:47 -04:00
Timothy Teakettle
1a5008fee7
Merge branch 'master' into wound-port
2020-07-18 23:06:49 +01:00
Lin
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Timothy Teakettle
974b80a2fd
Merge branch 'master' into wound-port
2020-07-18 21:45:24 +01:00
kappa-sama
c39a517519
nerf this
2020-07-18 03:47:31 -04:00
timothyteakettle
e8fade4f7f
changes
2020-07-18 02:29:12 +01:00
silicons
04df84d1e0
Merge pull request #12776 from timothyteakettle/snail-shells
...
snail shell backpack
2020-07-17 17:07:46 -07:00
Winter Flare
61f4fbc67a
Merge branch 'master' into foodport-p2-7/12/20
2020-07-17 19:27:50 -04:00
Timothy Teakettle
a4478b0cda
it continues
2020-07-17 22:38:28 +01:00
silicons
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
silicons
6121cbd091
Merge pull request #12738 from timothyteakettle/travelling-traders
...
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Keate Senior
6275b5ae97
Forgot the 'advanced' prefix here, since thats what it is, essentially
2020-07-15 00:07:57 -04:00
Winter Flare
d6413d5559
Adds Cracker Box, Soup
...
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04:00
Timothy Teakettle
0a4a0fadb3
snails
2020-07-14 20:59:25 +01:00
Keate Senior
80b4c03c82
Initial changes to get this to github for public reviewing
...
-Removes the Reebe z level and puts it on the cc z level
-Replaces the Neovgre mech stepsound
-Moves spacial gateway into drivers so the cult isn't stuck stationside
-Adds the Belligerant scripture, which applies the Belligerant status effect to non-clankers in range
-Various other changes currently commented out for later work on them.
-removes the abductor teleport cameras from Reebe
-adds a Brass multitool, essentially just an advanced multitool with a special sprite.
-makes clockcult armor have 0 laser defense normally and 10 defense when the ark is almost done summoning Ratvar instead of -25 --> -15
-Makes spear recalling worded to support the addition of new weapons to summon
-Adds new structures for power generation and shuttle delaying
-Other changes I've probably forgotton, but are too lazy to scrounge through the code at 12:43 AM
2020-07-12 00:43:54 -04:00
silicons
f99a0564de
Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
...
Trashbag Whitelist Update
2020-07-11 21:28:12 -07:00
Timothy Teakettle
c1592ad162
more rewards
2020-07-11 23:27:29 +01:00
Chiirno
2940f0efa5
Update code/game/objects/items/storage/firstaid.dm
...
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com >
2020-07-10 02:35:42 -04:00
silicons
6d1ca993f6
Merge pull request #12648 from timothyteakettle/tray-and-jar
...
bluespace tray + bluespace jar
2020-07-08 03:10:44 -07:00
silicons
6cbab55ef8
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
Cirno
2553ef6dd8
Am I finally free?
2020-07-05 00:46:56 -03:00
Winter Flare
767290d8e9
Trashbag Whitelist Update
...
Trashbag can now hold:
All Organs
Most Shoes
Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
2020-07-04 21:03:31 -04:00
Cirno
c2ba973c88
Merge remote-tracking branch 'origin' into emi
2020-07-04 15:59:47 -03:00
Ghommie
6fc584518a
Fixing (un)equip penalties from obscured inv slots.
2020-07-03 00:07:30 +02:00
Timothy Teakettle
15e137dd18
Merge branch 'master' into tray-and-jar
2020-07-01 22:06:17 +01:00
Timothy Teakettle
8a0ab009dd
give trays better capacity
2020-07-01 22:05:14 +01:00
