Commit Graph

17461 Commits

Author SHA1 Message Date
silicons
97e4aad75f changes 2020-12-21 17:14:22 -07:00
silicons
db6f9349c5 Merge pull request #13785 from Putnam3145/fix-grab-bag
Makes grab bag ONLY make station antags; triples alien dynamic threat.
2020-12-20 15:42:04 -07:00
Lin
3ad777f8f7 Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
2020-12-20 18:14:48 +00:00
silicons
7b1b633b21 Merge pull request #13774 from keronshb/Clowncar
Clown Car The Honkening
2020-12-20 10:34:29 -07:00
silicons
11aad4e6db Merge pull request #13801 from SandPoot/master
Makes limb grower better
2020-12-20 10:34:21 -07:00
silicons
e87bcb8aa1 Merge pull request #13809 from Putnam3145/harness-tweak-2
Makes gear harness cover nothing
2020-12-20 10:34:06 -07:00
silicons
8aafad611a Merge pull request #13811 from BlackMajor/borg-hypo
Prevents borg hypos from injecting if it would OD the target while on help intent
2020-12-20 10:33:45 -07:00
Lin
f6a6c138df Merge pull request #13776 from DeltaFire15/ai-kill-once
Makes Traitor AIs have 'kill once' objectives instead of 'assassinate'
2020-12-20 17:22:06 +00:00
Lin
a0eb6a9b5d Merge pull request #13799 from Citadel-Station-13/silicons-patch-28
fixes space ninjas being able to hardstun with their gloves
2020-12-20 17:21:37 +00:00
DeltaFire
e5eff3b028 Merge pull request #13792 from Citadel-Station-13/silicons-patch-25
fixes TEG circulators not being movable when unanchored
2020-12-20 18:11:33 +01:00
silicons
34f6697e81 Merge pull request #13796 from keronshb/fixedscarpchanges
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
Putnam
79e71b54e2 Made gear harness adjustable instead of none-cover by default. 2020-12-19 19:01:31 -08:00
DeltaFire
f458bc8182 Merge pull request #13803 from BlueWildrose/AI-RemoteDetonationCBT
Prevents traitor AI from doomsdaying while carded
2020-12-19 16:08:25 +01:00
BlueWildrose
98b1de5536 oh yes we don't want that do we? 2020-12-18 22:56:39 -07:00
DeltaFire
b37d948358 Merge pull request #13794 from Citadel-Station-13/silicons-patch-27
this one line broke atmos more at 10
2020-12-19 05:38:10 +01:00
DeltaFire
1e8e1ec72b Merge pull request #13786 from kiwedespars/why
x-ray laser nerfs
2020-12-19 05:28:43 +01:00
kiwedespars
9b710f5553 Update beams.dm 2020-12-18 15:53:11 -08:00
silicons
ca49f87e2c Merge pull request #13804 from timothyteakettle/please-sanitize-pin-data
[s] sanitizes circuits get pin data
2020-12-18 10:32:24 -07:00
silicons
a41e1b1077 Update ninjaDrainAct.dm 2020-12-18 05:00:16 -07:00
BlackMajor
e50760f641 Lilly please that's not funny 2020-12-19 00:59:50 +13:00
BlackMajor
8f30d5a686 Update borghydro.dm 2020-12-19 00:46:04 +13:00
Putnam
5c7ddaeedd Makes nightmare dynamic-controlled 2020-12-17 23:43:17 -08:00
Poojawa
6fe6e6d779 Update Citadel_Snowflake.dm 2020-12-18 01:36:56 -06:00
Putnam
7711bc1751 Makes gear harness cover nothing 2020-12-17 23:33:36 -08:00
keronshb
118d7a1dbf ACTUALLY prevents the clown car from moving onto a space tile
ACTUALLY prevents the clown car from moving onto a space tile
2020-12-18 00:01:11 -05:00
timothyteakettle
2aaddc2ee4 Update helpers.dm 2020-12-18 01:53:53 +00:00
Blue Wildrose
d4d5e53cb6 go away Travis 2020-12-16 19:27:04 -07:00
Blue Wildrose
9c60de46a1 Prevent AI from doomsdaying while carded 2020-12-16 18:45:41 -07:00
SandPoot
a0ae0c37fe upload files 2020-12-16 11:39:50 -03:00
silicons
029c755e15 Update ninjaDrainAct.dm 2020-12-16 02:49:37 -07:00
kiwedespars
98c3335dce doubles xray laser cost, 20 -> 10 shots 2020-12-15 21:04:10 -08:00
kiwedespars
a95ba25d17 Update beams.dm
25 -> 75 rad
15 -> 20 damage
2020-12-15 21:02:46 -08:00
keronshb
3d7c896100 Scarp Changes and Bundle
This should really fix it now.
2020-12-15 20:10:21 -05:00
keronshb
d08da76253 This should actually fix the space tile thing
Try 3
2020-12-15 19:45:48 -05:00
silicons
1d81434bbd Update datum_pipeline.dm 2020-12-15 15:52:00 -07:00
Lin
d776bcc867 Merge pull request #13791 from Citadel-Station-13/silicons-patch-23
[s]Update saved_circuits.dm
2020-12-15 21:46:48 +00:00
Lin
c022956c75 Merge pull request #13725 from silicons/anti_collision_bindings
makes keybind system automatically generate anti-collision keybinds where necessary to avoid unintentional macro fires
2020-12-15 21:24:30 +00:00
silicons
4a30064a2c Update saved_circuits.dm 2020-12-15 14:09:44 -07:00
silicons
bc9dbc0060 Update circulator.dm 2020-12-15 14:00:20 -07:00
silicons
4d6f2118c8 Update saved_circuits.dm 2020-12-15 13:32:27 -07:00
keronshb
830ae2b1c3 Code for preventing it on moving onto a space tile
For some reason this doesn't work so I've commented it out until I can figure out how to get it to work.
2020-12-15 12:14:49 -05:00
kiwedespars
92c70b8089 Update beams.dm 2020-12-14 19:46:28 -08:00
Putnam
f4d15f189b Also made alien threat WAY higher. 2020-12-14 18:38:11 -08:00
silicons
4db78b7868 Merge pull request #13757 from timothyteakettle/better-age-verification
changes the age gate to use date of birth
2020-12-13 23:09:41 -07:00
silicons
13bb064302 Merge pull request #13758 from timothyteakettle/better-holoforms
replaces custom holoform verb with an action, lets holoform AIs emote
2020-12-13 23:09:34 -07:00
DeltaFire
56963d2138 Merge pull request #13764 from Hatterhat/mech-sell
mechs leave no wrecks when sold on cargo shuttle
2020-12-14 06:04:21 +01:00
DeltaFire
d3f3862e18 Merge pull request #13696 from silicons/slime_tf
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
2020-12-14 05:57:03 +01:00
DeltaFire
dab3f6f125 Merge pull request #13699 from silicons/nanite_updates
nanite updates: permanent nanites, hostile lockdown, anti-virus, resistance tweaking
2020-12-14 05:56:48 +01:00
DeltaFire
1aa032df32 Merge pull request #13752 from Citadel-Station-13/silicons-patch-15
tweaks stamcrit to be removed when under 100 stamina damage, rather than at 140
2020-12-14 05:32:28 +01:00
DeltaFire
396fda3c0c Merge pull request #13771 from MrJWhit/better-donut-box-sprites
Better donuts boxes
2020-12-14 05:23:30 +01:00