312f3410a1
Merge pull request #13887 from HeroWithYay/Fix_Necrotizing_Fasciitis_description
...
Fix for Necrotizing Fasciitis
2020-12-28 17:43:39 +01:00
fd8f5c4afd
Makes coma more precedent.
2020-12-27 17:54:53 -08:00
33358776ec
Makes regen coma properly work at 25% when sleeping
2020-12-27 17:49:15 -08:00
1c0e3fcd12
Merge pull request #13873 from BlueWildrose/FasterThanTheSpeedOfLight
...
Nyctophobia quirk now triggers in 0.2 seconds instead of instantly
2020-12-27 10:24:10 -07:00
d06c82ae64
It has the wrong description, fixing it.
2020-12-28 03:21:41 +13:00
1d296e2816
addtimer proc instead of sleep
2020-12-25 20:18:02 -07:00
147f148c78
Nyctophobia quirk: Effect now triggers in 0.2 seconds instead of instantly
2020-12-25 19:05:13 -07:00
48cbe2ce46
snap
2020-12-22 19:15:52 +01:00
d3f30d21cf
Merge pull request #13772 from silicons/respawn_system_2
...
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
ea21151462
LF
2020-12-20 18:55:45 -07:00
34f6697e81
Merge pull request #13796 from keronshb/fixedscarpchanges
...
Scarp Changes and Bundle
2020-12-20 09:23:20 -07:00
1d604d489c
Merge pull request #13763 from Hatterhat/rped-qol
...
RPED drops lowest tier parts
2020-12-16 05:17:44 +01:00
3d7c896100
Scarp Changes and Bundle
...
This should really fix it now.
2020-12-15 20:10:21 -05:00
263a75ec45
how moment
2020-12-14 16:24:08 -06:00
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
b34f5d56f6
Merge remote-tracking branch 'citadel/master' into respawn_system_2
2020-12-13 22:54:16 -07:00
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
016d3d39fc
emote over holopad
2020-12-13 22:18:54 +00:00
5c830d4d44
Merge remote-tracking branch 'citadel/master' into respawn_system_2
2020-12-13 02:34:57 -07:00
04c35f3161
now this is actually based
2020-12-12 20:48:59 -06:00
07d8e72125
fix
2020-12-12 11:19:45 -07:00
ab9d26285c
Update dna.dm
2020-12-12 10:13:17 -07:00
abf950ee17
Update dna.dm
2020-12-12 02:49:27 -07:00
c00fb31da8
Update dna.dm
2020-12-12 01:47:23 -07:00
f0e51d666c
Merge pull request #13617 from timothyteakettle/loadout-json
...
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
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
8846e69c42
ANOTHER ONE
2020-12-07 21:34:52 +00:00
73d3234882
buncha changes
2020-12-07 22:15:04 +01:00
61cc33d995
Merge remote-tracking branch 'upstream/master' into loadout-json
2020-12-06 17:26:04 +00:00
0f540884eb
Merge branch 'master' into loadout-json
2020-12-06 17:24:24 +00:00
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
60a0db7730
oh thanks
...
Co-authored-by: DeltaFire15 <46569814+DeltaFire15@users.noreply.github.com >
2020-11-25 22:20:50 -07:00
a3208d1ac8
synth alcohol immunity
2020-11-24 20:27:34 +01:00
b000ea6a25
Attempts to make emotes part of the local filter.
2020-11-24 06:02:34 -08:00
89d18c681d
buffed again
2020-11-22 15:16:40 -07:00
18bdda1273
fix
2020-11-22 15:01:19 -07:00
13ebceb670
why did i do this
2020-11-22 14:56:02 -07:00
37e26833a6
wew
2020-11-22 14:16:14 -07:00
9d300ade35
Merge pull request #13677 from silicons/newlines
...
Adds missing EOF newlines
2020-11-18 17:50:38 -08:00
891d4ec76e
Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
...
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
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
185c8929b0
Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel
2020-11-16 04:29:43 +01:00
9d7226cb4d
Merge pull request #13670 from shellspeed1/master
...
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
e0b2156142
fixes fixes fixes
2020-11-14 19:26:54 +01:00
a0fac5924f
e
...
I want my warcrime supply pods to work and not runtime
2020-11-14 18:00:25 +01:00
803bff4e5f
funny
2020-11-12 23:34:42 -07:00
7a0c0a0e04
You can now build floor bots with any toolbox
2020-11-09 21:24:45 -08:00
77a1bdba0c
Merge pull request #13630 from timothyteakettle/short-tall-quirks
...
character size scaling
2020-11-07 00:19:29 -07:00
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
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