silicons
b34f5d56f6
Merge remote-tracking branch 'citadel/master' into respawn_system_2
2020-12-13 22:54:16 -07: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
silicons
5c830d4d44
Merge remote-tracking branch 'citadel/master' into respawn_system_2
2020-12-13 02:34:57 -07:00
silicons
07d8e72125
fix
2020-12-12 11:19:45 -07:00
silicons
ab9d26285c
Update dna.dm
2020-12-12 10:13:17 -07:00
silicons
abf950ee17
Update dna.dm
2020-12-12 02:49:27 -07:00
silicons
c00fb31da8
Update dna.dm
2020-12-12 01:47:23 -07:00
Putnam3145
f0e51d666c
Merge pull request #13617 from timothyteakettle/loadout-json
...
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
silicons
a4e6df8f9a
Merge pull request #13738 from DeltaFire15/heretic-tweaks
...
Updates the heretics gamemode with a bunch of changes from /tg/
2020-12-09 21:47:46 -07:00
Timothy Teakettle
8846e69c42
ANOTHER ONE
2020-12-07 21:34:52 +00:00
DeltaFire
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
timothyteakettle
61cc33d995
Merge remote-tracking branch 'upstream/master' into loadout-json
2020-12-06 17:26:04 +00:00
timothyteakettle
0f540884eb
Merge branch 'master' into loadout-json
2020-12-06 17:24:24 +00:00
Putnam
809e270290
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into make-emotes-local
2020-12-02 08:16:22 -08:00
silicons
60a0db7730
oh thanks
...
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com >
2020-11-25 22:20:50 -07:00
DeltaFire
a3208d1ac8
synth alcohol immunity
2020-11-24 20:27:34 +01:00
Putnam
b000ea6a25
Attempts to make emotes part of the local filter.
2020-11-24 06:02:34 -08:00
silicons
89d18c681d
buffed again
2020-11-22 15:16:40 -07:00
silicons
18bdda1273
fix
2020-11-22 15:01:19 -07:00
silicons
13ebceb670
why did i do this
2020-11-22 14:56:02 -07:00
silicons
37e26833a6
wew
2020-11-22 14:16:14 -07:00
Putnam3145
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
silicons
891d4ec76e
Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
...
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
silicons
a950bcb0fb
Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
...
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
DeltaFire
185c8929b0
Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel
2020-11-16 04:29:43 +01:00
silicons
9d7226cb4d
Merge pull request #13670 from shellspeed1/master
...
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire
e0b2156142
fixes fixes fixes
2020-11-14 19:26:54 +01:00
DeltaFire
a0fac5924f
e
...
I want my warcrime supply pods to work and not runtime
2020-11-14 18:00:25 +01:00
silicons
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
shellspeed1
7a0c0a0e04
You can now build floor bots with any toolbox
2020-11-09 21:24:45 -08:00
silicons
77a1bdba0c
Merge pull request #13630 from timothyteakettle/short-tall-quirks
...
character size scaling
2020-11-07 00:19:29 -07:00
silicons
d500a12b70
adds EMOTE_BOTH and EMOTE_OMNI which is both audible/visible and ignores checks entirely. subtler/subtle is omni and regular emotes are both. ( #13584 )
...
* Update say.dm
* Update mob.dm
* Update emotes.dm
* Update say_vr.dm
* Update emote.dm
* Update emotes.dm
* Update mob.dm
* Update say_vr.dm
* Update drake.dm
2020-11-01 22:09:38 +01:00
Timothy Teakettle
46dbb9345d
slime puddles look better and cant be abused by lings ( #13567 )
...
* perfect
* further changes
* no squeaking please
* no more squeaking damnit
* no more squeaking damnit
* slower
* they get broken armor
* broken armor application
* Apply suggestions from code review
* add a comma
* make crossed work properly
* Update squeak.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-11-01 21:40:58 +01:00
DeltaFire
a07ab809ff
fixes a thing
...
Previously, if a wound was removed while there wasa surgery related to it going on, it'd just qdel() the surgery, which is.. kinda weird, since it, y'know, takes the closing step away from you, and all wound surgeries have checks for no wound being present anyways.
2020-10-31 18:04:59 +01:00
Timothy Teakettle
f5804fd0e4
yes
2020-10-30 20:41:13 +00:00
silicons
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons
1a1b6af819
Merge pull request #13603 from kappa-sama/patch-43
...
controversial shotgun buff (very scary)
2020-10-28 07:44:02 -07:00
timothyteakettle
b1379dd49e
still not working
2020-10-27 21:11:42 +00:00
Timothy Teakettle
78e3eb14f9
another typo
2020-10-26 20:42:22 +00:00
Timothy Teakettle
0fa83322a1
re-add slow stride but it defaults to disabled
2020-10-26 20:40:11 +00:00
Timothy Teakettle
f468e4940a
typo
2020-10-26 20:33:46 +00:00
Timothy Teakettle
2b00f2bb2f
config values
2020-10-26 20:27:02 +00:00
Timothy Teakettle
cfefe99d35
okay so what if its not quirks
2020-10-26 17:45:43 +00:00
Ghommie
f49f72338f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841
2020-10-25 15:01:57 +01:00
Ghommie
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
silicons
231c5f0a9d
Merge pull request #13581 from Ghommie/Ghommie-cit840
...
mime/clown masks' face concealment toggleable with altclick. Plasmaman helmet welding visor & smiley port.
2020-10-21 15:43:09 -07:00
kappa-sama
aa696edd84
this
2020-10-20 19:39:23 -04:00
Putnam3145
ac823ae29b
Merge pull request #13583 from Citadel-Station-13/silicons-patch-1
...
fixes squeak components reacting to cross rather than crossed
2020-10-18 22:45:59 -07:00
Zandario
fcd8fec815
Fixes an oversight and updates some defines ( #13558 )
2020-10-17 12:37:58 +02:00
silicons
f16343d726
Update squeak.dm
2020-10-16 20:48:11 -07:00
