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
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
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
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
f5804fd0e4
yes
2020-10-30 20:41:13 +00:00
0307884eab
Merge pull request #13627 from Ghommie/Ghommie-cit841
...
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
1a1b6af819
Merge pull request #13603 from kappa-sama/patch-43
...
controversial shotgun buff (very scary)
2020-10-28 07:44:02 -07:00
b1379dd49e
still not working
2020-10-27 21:11:42 +00:00
78e3eb14f9
another typo
2020-10-26 20:42:22 +00:00
0fa83322a1
re-add slow stride but it defaults to disabled
2020-10-26 20:40:11 +00:00
f468e4940a
typo
2020-10-26 20:33:46 +00:00
2b00f2bb2f
config values
2020-10-26 20:27:02 +00:00
cfefe99d35
okay so what if its not quirks
2020-10-26 17:45:43 +00:00
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
90c4cb2022
Here I fix a few issues.
2020-10-25 14:50:42 +01:00
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
aa696edd84
this
2020-10-20 19:39:23 -04:00
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
fcd8fec815
Fixes an oversight and updates some defines ( #13558 )
2020-10-17 12:37:58 +02:00
f16343d726
Update squeak.dm
2020-10-16 20:48:11 -07:00
c0f3317c01
mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port.
2020-10-16 20:27:09 +02:00
8287005dd5
does what it says on the title ( #13563 )
2020-10-15 11:49:05 +02:00
29b7b49fe9
Merge pull request #13528 from DeltaFire15/robotic-limbs-PT2
...
Robotic limbs 2 : Threshhold Boogaloo
2020-10-11 17:33:00 -07:00
3224533a7c
Merge branch 'master' into spooder
2020-10-11 14:31:23 -05:00
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
7f611a98e1
Merge remote-tracking branch 'citadel/master' into combat_rework_experimental
2020-10-10 22:23:22 -07:00
737b6460af
Merge pull request #13497 from Zandario/species-refactor
...
Refactors some defines for easier Species Development
2020-10-10 22:00:49 -07:00
2919dfee2e
Merge pull request #13014 from Hatterhat/tendril-minimum
...
[REVIEW PLEASE] Minimum Megas/Tendrils For Lavaland But Cleaner I Swear
2020-10-10 21:58:15 -07:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
Putnam3145