70926f5daf
Merge remote-tracking branch 'upstream/master' into floorcluwneport
2021-05-31 22:21:34 -04:00
46833abf0b
add cult_permitted area flag
2021-05-27 19:34:00 -05:00
8f1db2d5ec
Fixes some stuff
...
Actually ticks the spell, fixes the brain damage issue, etc.
2021-05-27 12:16:54 -04:00
9e3c1ff860
adds floor cluwnes from yog
2021-05-24 22:46:59 -04:00
36fe3fef76
abuse
2021-05-24 21:40:15 -04:00
bd05dd29b6
ReinforcedPlasmaSteps
...
Adds more steps for deconning stronger windows
2021-05-22 13:58:01 -04:00
e580c504fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
2021-05-21 18:52:16 -07:00
62279e449e
Well, that works
2021-05-21 18:51:13 -07:00
b8b25662ff
Couple of fixes, almost ready to go
2021-05-18 22:12:02 -04:00
d2f69acaf8
Space Dragon Event
...
Ports the Space Dragon event
2021-05-18 12:06:32 -04:00
5601badbff
deterministic explosion system ( #13392 )
...
* wae explosions
* okay
* changes
* fixes
* fix
* ok
* ok
* kills more dead code
* okay
* fix
* ok
* tiles
* ok
* okay
* woops
* ok
* fix
* okay
* mob damage
* fixes
* insanity
* more
* more
* fixes
* more
* woot
* don't commit that
* YES
* fix
2021-05-12 05:44:53 -05:00
11a7e118fe
Puts off balance duration to 2 seconds
...
Might be better at 2.
2021-05-07 23:58:09 -04:00
7947258e51
Off balance disarm
...
If it hits a wall or a person while under the effect of off balance.
2021-05-05 23:57:01 -04:00
63d910c79c
Merge branch 'master' into the-fuck-am-i-doing
2021-05-05 17:26:41 +02:00
be2e962983
Off Balance for Guns only again
...
Was intended for guns
2021-05-04 00:51:16 -04:00
8f3a44f44a
fancy gateway
2021-05-02 18:57:04 -03:00
4289b8be1e
Merge remote-tracking branch 'citadel/master' into backend_sync
2021-04-28 22:34:17 -07:00
e3755fba92
Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
...
Ports a significant amount of the tg cybernetic organ code + more
2021-04-28 21:20:57 -06:00
fefb33454f
do that too
2021-04-28 16:16:55 -07:00
47489c21d6
Merge remote-tracking branch 'citadel/master' into auxtools-atmos
2021-04-27 00:59:45 -07:00
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
5bb6078def
upload files
2021-04-22 20:39:21 -03:00
0f04bbb23b
Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power
2021-04-22 13:06:31 +10:00
75e0e893a2
Merge branch 'master' into baton_change_pr
2021-04-19 10:55:33 +10:00
0dcc6b44ba
Merge pull request #14543 from qweq12yt/cargo-bugfixes
...
Cargo bugfixes
2021-04-18 18:52:54 -06:00
cd9ccb82d7
Merge pull request #14594 from DrPainis/patch-7
...
Makes insect blood not look like diarrhea.
2021-04-18 18:49:43 -06:00
e8e625cb5c
Merge pull request #14603 from Putnam3145/fix-base-option
...
Activity tracking; traitor class tweaks
2021-04-18 18:49:27 -06:00
02f4bd8f3a
Merge pull request #14591 from zeroisthebiggay/deathrattles
...
ports deathrattle implants but without mob statchange because i am not gonna port that today
2021-04-18 18:48:08 -06:00
4811216f07
Activity tracking; traitor class tweaks
2021-04-13 06:42:32 -07:00
055c191e7e
replaces diarrhea with mustard
...
yes
2021-04-09 00:55:08 -04:00
7ca46715d7
Merge branch 'master' into cargo-bugfixes
2021-04-08 19:15:55 -03:00
a7c061392b
i hate tg code
2021-04-08 18:05:36 -04:00
f998efa7bc
Merge pull request #14551 from BlueWildrose/ThePuddler2
...
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
b363cdd5ca
fixes puddles, cultism checks, spellchecks
2021-04-01 04:29:35 -07:00
37be0768b3
goodbye define - more comments
2021-03-31 01:08:01 -03:00
f976a89157
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-31 08:19:31 +08:00
ee4f019459
Merge pull request #14506 from timothyteakettle/loadout-tab-defines
...
fixes character previews but does it using defines (thanks zero)
2021-03-27 01:34:16 -06:00
bdbb33842e
Merge pull request #14513 from Putnam3145/chaos-for-secret
...
Makes threat a subsystem instead of dynamic-attached
2021-03-27 01:33:27 -06:00
bf382f490c
Merge pull request #14518 from necromanceranne/shield_explodies_fix
...
Shields: Changes, additional flags, bug fixes, sprites
2021-03-27 01:31:55 -06:00
899b94f0f3
Made threat a subsystem instead of dynamic-attached.
2021-03-24 23:44:37 -07:00
32797e0446
Merge pull request #14480 from BlueWildrose/sensorydetail
...
Adds suit sensor damage, clothing damage changes
2021-03-24 19:25:24 -06:00
45340ef1ac
Makes shove off-balancing remove any active item, not just guns. Makes baton knockdowns not go on cooldown from normal hits, makes baton offbalance trait share a duration. Gives the stunprod a little more oomph to keep it comparable to unarmed.
2021-03-25 09:27:33 +11:00
79de55c58c
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
2021-03-25 09:07:52 +11:00
e3fb2d5491
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-24 21:55:47 +08:00
ebf652f736
Merge pull request #14472 from silicons/sigh_615
...
makes the global antag disable pref more clear. forces savefile update to default all players to having the **disable** *disabled* (i love double negatives).
2021-03-23 17:53:50 -05:00
0a48fbfeba
Update loadout.dm
2021-03-23 21:39:55 +00:00
bfb122d706
Merge pull request #14475 from qweq12yt/black-market-fixes
...
Black Market: The return
2021-03-22 21:14:57 -06:00
f1e55f2df0
Paranoid updates to maybe fix air duplication
2021-03-20 22:02:47 -07:00
1fd06a89b7
Oh Boy
2021-03-20 16:27:52 -07:00
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
keronshb