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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
38,630 Commits 55 Branches 0 Tags
8e83dcd697acb5f8654bee7b239751aca89c72b1
Commit Graph

67 Commits

Author SHA1 Message Date
silicons
8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
Timothy Teakettle
eba1e8f301 fixes the merge conflicts 2020-06-15 23:29:49 +01:00
kevinz000
8162303bad Merge remote-tracking branch 'citadel/master' into pp_fix 2020-06-13 12:03:01 -07:00
kevinz000
180b7d31d9 sigh 2020-06-13 09:24:22 -07:00
kevinz000
433bd1af79 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-27 18:11:15 -07:00
Ghom
968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
kevinz000
e4eb49050c Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-24 15:03:06 -07:00
Ghom
12ac08d7c5 Porting tesla/electrocute code updates. (#12280) 
* Porting tesla/electrocute code updates.

* Why is the dominator being insta-deleted by zaps a good idea?

* Yikes.

* ah
 2020-05-17 16:35:17 -07:00
kevinz000
f034c7c536 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-05-05 17:38:43 -07:00
Ghommie
cd642aff73 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit682 2020-05-01 22:12:00 +02:00
kevinz000
f99d904dc7 ports /tg/station vis_flags related fixes (#12064) 
* fixes

* Update layers_planes.dm

* kay
 2020-05-01 21:14:04 +02:00
Ghom
f37cfd5e98 Update bitfields.dm 2020-04-21 20:00:41 +02:00
Ghommie
5a4fecdeb8 tested and it works now, I'm glad. 2020-04-20 19:22:42 +02:00
kevinz000
e533103ed2 Merge branch 'master' into shield_bashing 2020-04-15 19:34:08 -07:00
kevinz000
f3537f38e6 shield bashing 2020-04-11 07:09:50 -07:00
kevinz000
f8a7a68ac3 lmao 2020-04-11 05:52:37 -07:00
kevinz000
f652a612e5 missing comma 2020-04-10 22:18:53 -07:00
kevinz000
3788496204 multiline support 2020-04-10 12:42:50 -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
kevinz000
34fbcd1dc0 fixes 2020-02-19 07:49:05 -07:00
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghommie
02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
fb2b259d92 Ports "Refactors can_see_reagents" 2019-12-19 17:17:18 +01:00
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss" 
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
 2019-11-27 20:23:33 -06:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
Ghommie
475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Thalpy
f592fc325e Formmating 2019-10-08 07:47:10 +01:00
Thalpy
edb26eeaeb Master of confusion 2019-10-08 07:44:32 +01:00
Thalpy
281c6e04e8 Hmm 2019-10-08 07:43:51 +01:00
Thalpy
4538c43ede Oops 2019-10-08 07:39:41 +01:00
Thalpy
f7d14ebb2c Damnit webedit 2019-10-08 07:39:19 +01:00
Thalpy
564c1fde9f Merge branch 'master' into Reagents_bitflats 2019-10-08 07:31:03 +01:00
kevinz000
0073d99a22 Merge pull request #9309 from Thalpy/tg-Organ-port 
[READY][SUCCESSFULLY TESTMERGED] Ports TG's organ handling (with a few tweaks to make it fit).
 2019-10-07 23:29:19 -07:00
Thalpy
27c2c89766 Merge branch 'master' into Reagents_bitflats 2019-10-05 23:43:19 +01:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00
Fermi
d44fbd3fb1 Brain fix 2019-09-27 23:46:44 +01:00
Fermi
9b2f67d67d reagent_flags is used elsewhere, renamed to chemical_flags 2019-09-20 19:43:37 +01:00
Fermi
3f2933adbf Ghommies' requests. 2019-09-19 23:31:36 +01:00
Ghommie
2a7b802957 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-08-29 21:01:23 +02:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. 
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
 2019-07-28 17:31:59 +01:00
Ghommie
6000f96dbc deleted some boolean variables in favor of bitflags. 2019-07-24 02:00:30 +02:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
LetterJay
d255295cc2 Merge pull request #7612 from deathride58/imalwaysaslutformorememory 
Mirrors tgstation/tgstation#40662 (100mb memory freed up roundstart, hell ya)
 2018-10-03 22:33:16 -05:00
nik707
595d4c3504 Alternative Miner Suits (#7611) 
* haha what the fuck this took like a solid 6 hours

* allows new suits to spawn on legion corpses.

* Update flags.dm

* Fix conflict maybe

* pls work

* im a big gay
 2018-10-03 20:32:25 -07:00