Commit Graph

27175 Commits

Author SHA1 Message Date
silicons
70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp
Adds clown waddle to clown shoes.
2021-02-08 03:02:40 -07:00
silicons
a3187e8216 Merge pull request #14196 from timothyteakettle/sentient-virus
sentient viruses can now infect synths and ipcs (fastest salt in the west)
2021-02-08 03:02:31 -07:00
keronshb
38827122e9 Adjusts warp implant to 30 second delay
who thought this was a good idea
2021-02-07 23:50:42 -05:00
keronshb
952d2e1e60 Removes the power sink objective
Alternative to the other PR
2021-02-07 23:41:27 -05:00
zeroisthebiggay
0c0ff44c23 pog
pog
2021-02-07 22:01:57 -05:00
DeltaFire
d482d387ee whoops 2021-02-07 18:24:18 +01:00
TyrianTyrell
7fff6a75c0 Update tongue.dm 2021-02-07 04:29:19 -05:00
silicons
cf4a5f3388 Merge pull request #14189 from dzahlus/diversify-sound
Diversify weapon sound
2021-02-06 11:42:36 -07:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
silicons
08356ee7f7 Merge pull request #13966 from Thalpy/Dispencer-UI-change
[Ready] Fixes and tweaks for the chemistry machine suite
2021-02-06 11:41:08 -07:00
timothyteakettle
a9170aae93 Update priority_announce.dm 2021-02-06 17:42:37 +00:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
Fermi
f236b2da29 Merge branch 'master' into Dispencer-UI-change 2021-02-06 02:40:27 +00:00
Timothy Teakettle
4b51174717 Update disease_disease.dm 2021-02-05 16:43:18 +00:00
DeltaFire
bbcf23fae9 Merge pull request #14182 from Citadel-Station-13/silicons-patch-8
i hate xenobiology players
2021-02-05 16:09:58 +01:00
SmArtKar
18a82a242f CI 2021-02-05 12:20:18 +03:00
SmArtKar
c9e97986c8 Patches, fixes, NUCLEAR CARDS 2021-02-05 12:13:38 +03:00
silicons
3f4aff09d1 Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
2021-02-05 00:59:19 -07:00
Chiirno
e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00
Chiirno
c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
raspy-on-osu
a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu
3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
silicons
89c63a243f Update card.dm 2021-02-04 13:23:03 -07:00
TyrianTyrell
d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
7ffbc07e03 Update preferences.dm 2021-02-04 15:08:32 -05:00
TyrianTyrell
26d911a643 Update preferences.dm 2021-02-04 15:07:52 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
silicons
055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07:00
silicons
497c6b8d2c Merge pull request #14174 from keronshb/meathook-adjustment
Meathook Adjustments
2021-02-04 12:53:14 -07:00
silicons
d4f978c6db Merge pull request #14172 from keronshb/cell-charger-upgrade
Cell Charger Buffs
2021-02-04 12:50:30 -07:00
silicons
a3fc6b7f80 Merge pull request #14170 from SmArtKar/firer_fix
Fixes KAs being broken by circuits
2021-02-04 12:50:19 -07:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe
Port of TG's "Auto Observe"
2021-02-04 12:49:09 -07:00
silicons
bec5d6d8a3 Merge pull request #14132 from shellspeed1/salt-nerf-romerol
MASSIVE SALT NERF
2021-02-04 12:45:11 -07:00
SmArtKar
1b4072a1b6 Well, reverts illegal cards not saving. Fuck it 2021-02-04 22:36:46 +03:00
SmArtKar
6c92e99899 desc 2021-02-04 22:13:59 +03:00
SmArtKar
dedb2d2c6c CI again... 2021-02-04 22:13:23 +03:00
SmArtKar
24619344f5 Traitor/nuke ops cards no longer count as real cards in binders(they are cheap knock-offs like come on nobody will believe that its a real card) 2021-02-04 19:08:35 +03:00
SmArtKar
2135a391dc More cards? More cards! 2021-02-04 19:03:03 +03:00
SmArtKar
2cd339f776 Adds Card Ops bundle 2021-02-04 18:57:00 +03:00
SmArtKar
c202914b65 FUUUUUUUUUUUUCK YOUUUUUU 2021-02-04 17:50:56 +03:00
SmArtKar
9d82e18308 Removal of junk 2 2021-02-04 17:36:10 +03:00
SmArtKar
7a5ee6f668 Removal of junk 2021-02-04 17:35:27 +03:00
SmArtKar
a8fa3ba4e1 fucked up 2021-02-04 17:28:10 +03:00
SmArtKar
a6376fbf3d slight balance 2021-02-04 17:27:48 +03:00
SmArtKar
348f57968f Adds unique ruin cards and Exodia cards) 2021-02-04 16:42:55 +03:00
Fermi
fe3dbb32ba Removes buffer from dispensers 2021-02-04 01:13:08 +00:00
dzahlus
c896d50e56 get hardscoped
new weapon sounds for the sniper rifle and the AT pistol
2021-02-03 22:29:08 +01:00
dzahlus
6da6c0749c gunshotshotgunshot.ogg
Yeah I use the gunshotshotgunshot you know why? Also fixes firing_sound erro to fire_sound on surplus rifle
2021-02-03 22:14:27 +01:00
dzahlus
2ffe5dda10 RIFLEMAN 300m FRONT
BRO WHERE I CANT FUCKING SEE SHIT FUCKING TERMINATOR AI. Adds unique rifle sounds for AR, M90 and Mosin.
2021-02-03 21:35:49 +01:00