cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,876 Commits 55 Branches 0 Tags
45ee1cbbf875c2cfe2baea3a42febcf75a25d3a6
Commit Graph

2362 Commits

Author SHA1 Message Date
kevinz000
300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
Ghommie
6c6b2a42eb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit629 2020-03-21 15:04:35 +01:00
kevinz000
6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
kevinz000
cc8d8da0fe Merge pull request #11531 from Ghommie/Ghommie-cit630 
Removing some egg-celent unused preferences.
 2020-03-20 22:56:19 -07:00
kevinz000
32bfdb6712 Update cit_screenshake.dm (#11554) 2020-03-21 01:52:39 +01:00
kevinz000
225d5a3c40 Nerfs HoS taser and warden stun pump action blaster (#11352) 
* Update stun.dm

* Update pumpenergy.dm
 2020-03-20 16:09:10 +01:00
Ghommie
7c22b341b9 Undefined var. 2020-03-19 17:38:41 +01:00
Ghommie
eca7eb2bcd Nothing 2020-03-19 17:35:18 +01:00
Ghommie
eeab3ed11f Everyday 2020-03-19 17:34:01 +01:00
Ghom
da7a979842 Merge branch 'master' into Ghommie-cit629 2020-03-19 17:15:26 +01:00
Ghommie
dd7046cbd1 no comment 2020-03-19 16:53:58 +01:00
Artur
ba972cf0eb Argh 2020-03-18 22:41:21 +02:00
Seris02
fb0925047a mentor fixes and improvements (#11519) 
* one teensy fix but imma go do something else quick

* yee?

* yee?

* yee 3

* ah shit

* uhhhhhh

* oh
 2020-03-18 19:23:19 +01:00
kevinz000
c14b1c2857 linter 2020-03-16 14:18:47 -07:00
kevinz000
a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000
2113b63428 o boy 2020-03-14 21:42:23 -07:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Ghom
9f681e9a76 Merge pull request #11409 from necromanceranne/taser_nerf 
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
 2020-03-12 00:30:52 +01:00
kevinz000
46823a127b Merge pull request #11335 from Ghommie/Ghommie-cit604 
Made flavor texts into an element datum, appliable to every atom.
 2020-03-10 17:26:20 -07:00
Ghommie
2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000
3d6c82cbc8 Merge pull request #11381 from Citadel-Station-13/Ghommie-patch-2 
Something about layers.
 2020-03-10 05:59:36 -07:00
necromanceranne
e0df350579 PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals. 2020-03-10 23:21:59 +11:00
Ghommie
0587d3482d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604 2020-03-09 21:53:22 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghom
038f37d309 Something about layers. 2020-03-08 05:10:03 +01:00
Putnam
ddd4d14477 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into eigenstasium-nope 2020-03-06 22:57:12 -08:00
Putnam
c221135849 eigenstasium no longer encourages certain personalities 2020-03-06 14:58:33 -08:00
Ghom
65b7833738 Merge pull request #11336 from Putnam3145/mkultra-aaa 
Makes MKUltra's explosion no longer spread prefbreak gas
 2020-03-06 21:47:14 +01:00
kevinz000
9420424c8f Merge pull request #11332 from Ghommie/Ghommie-cit603 
Replaces EXCEPTION() with stack_trace() and CRASH()
 2020-03-06 00:14:13 -07:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
Putnam
658489a15a no this is how you do it. 2020-03-05 11:26:42 -08:00
Putnam
52045a659b Made MKUltra use the default explosion. 2020-03-05 11:15:54 -08:00
Ghommie
2cbdae2f0a Made flavor texts into an element datum. 2020-03-05 18:46:33 +01:00
Ghommie
bb7bfc04cc Replaces EXCEPTION() with stack_trace() and CRASH() 2020-03-05 01:47:04 +01:00
Ghom
5e4f8dc6a0 Merge pull request #11181 from Detective-Google/big-chode-energy 
changes sausage girth from circumference -> diameter
 2020-03-04 23:49:58 +01:00
kevinz000
8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
Artur
5d3f3fc06a WIP 2020-02-28 14:11:38 +02:00
kevinz000
67c857292f Aa 2020-02-27 20:09:33 -07:00
kevinz000
9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000
995aa6cdec fix 2020-02-27 20:07:34 -07:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
Detective-Google
1f88a22d04 Merge branch 'master' into big-chode-energy 2020-02-27 16:39:57 -06:00
Detective Google
b7aad30d3c girth -> diameter 2020-02-27 16:38:14 -06:00
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02
84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00