SandPoot
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
SandPoot
a65f323734
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit
2024-03-08 19:10:22 -03:00
SandPoot
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
SandPoot
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
SandPoot
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
SandPoot
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
Hatterhat
38bd037b66
box that mf up
2022-10-04 14:14:04 -05:00
silicons
da09439093
Merge pull request #15585 from SandPoot/Initialize(mapload)
...
Every case of initialize that should have mapload, does
2022-04-15 17:41:57 -07:00
SandPoot
13fb647b9e
Update files ( #15597 )
2022-04-15 16:31:50 +02:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
Artur
be46eba465
Moves stasis handling to component-based
2022-04-07 14:10:51 +03:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
Artur
c36019bf56
Adds stasis beds
2022-04-06 15:38:05 +03:00
SandPoot
4da5a57688
global
2022-03-16 18:33:32 -03:00
SandPoot
baee52349b
Upload files
2022-03-16 15:41:07 -03:00
silicons
861a9f854f
Merge pull request #15476 from DeltaFire15/core-alt-pr
...
Buffs regen core healing for robots on lavaland, nerfs regen cores when not on lavaland
2022-03-13 14:26:06 -07:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
silicons
af6e43c595
refactors clickcatchers/parallax/fullsceren ( #15460 )
...
* :)
* that
* move those there
* refactor that too
* wew
* stuff
* almost.
* sigh
* just need speed
* stuf
* pain
* hm
* tweaks
* that
* eh
* wack
* a
* done
* that's important
* wacky
* all that
* fixes
* typo
* that
* a
* funny
* that
* that
* woo
* help im losing my fucking mind
* okay
* fix
2022-02-07 15:17:24 -08:00
DeltaFire
1d1a153808
buffnerf
...
buffs cores for robots on lavaland
nerfs cores when not on mining z
2022-01-22 19:17:05 +01:00
keronshb
8978ee10fe
Merge remote-tracking branch 'upstream/master' into familyport
2021-10-28 14:41:46 -04:00
Hatterhat
7fb3666f43
funny hands gaming
2021-10-22 22:05:18 -05:00
keronshb
8cb16aa0f3
Fixes item transfers
2021-10-14 17:26:17 -04:00
keronshb
13140f9bb9
Somewhat fixed huds and stuff, not 100%
2021-10-14 16:36:18 -04:00
keronshb
6331ced3e5
The rest of the offering stuff
2021-10-13 22:13:33 -04:00
keronshb
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
keronshb
0bae06adcd
Original Port
2021-10-11 22:00:54 -04:00
silicons
aa7a376dd5
removes DoT
2021-09-12 20:10:01 -07:00
Artur
82ccfc40dc
/obj/screen --> /atom/movable/screen
2021-07-29 13:57:19 +03:00
silicons
0069f12c6f
errors
2021-06-28 13:17:14 -07:00
silicons
a5a476f457
cyborg shovies
2021-06-28 13:10:40 -07:00
silicons
08f251a88c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-06-27 10:44:51 -07:00
Artur
724b34f55d
https://github.com/tgstation/tgstation/pull/54710
2021-06-16 00:44:32 +03:00
silicons
8fe45263c5
whew
2021-04-26 22:58:30 -07:00
silicons
7ccb5bc711
fixes
2021-04-26 14:21:59 -07:00
silicons
275b532a8c
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-04-26 14:17:43 -07:00
necromanceranne
75e0e893a2
Merge branch 'master' into baton_change_pr
2021-04-19 10:55:33 +10:00
Blue Wildrose
e29beaf852
I'll use this linter error as an opportunity to fix some grammar
2021-04-03 11:26:35 -07:00
necromanceranne
8091844a1c
Urist McGreyshit regains their grip on the !
2021-03-27 14:06:41 +11:00
necromanceranne
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
silicons
5b2a42f254
Merge remote-tracking branch 'citadel/master' into combat_v7
2021-03-20 14:13:23 -07:00
kiwedespars
e145bdafe8
adds domain expansion
...
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
kiwedespars
3ce6459aef
void heretic and many other prs
2021-03-09 02:58:34 -08:00
silicons
c6ba7bfe1f
changes
2021-03-06 18:06:53 -07:00
silicons
70b8d833c0
changes
2021-02-28 00:00:14 -07:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
silicons
ce0891c2eb
Merge pull request #14021 from DeltaFire15/emp-fuckeroni
...
Fixes combat mode being permanently disabled under specific circumstances
2021-01-13 16:57:42 -07:00
silicons
c66874f732
Merge pull request #14032 from kappa-sama/kaiowhat
...
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
kappa-sama
c751f114aa
finally
2021-01-12 01:42:55 -05:00
DeltaFire
3f6939c1cb
fix
2021-01-10 06:20:27 +01:00
DeltaFire
05f7991981
snap
2021-01-09 20:37:24 +01:00
