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 2026-08-27 22:57:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
413 Commits
Author SHA1 Message Date
BongaTheProto 767ab375f8 Merge remote-tracking branch 'upstream/master' 2022-05-18 08:02:44 -05:00
SandPoot 1e579c48fa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-18 02:49:40 -03:00
SandPoot 5dad84a486 Update files 2022-05-16 21:44:25 -03:00
BongaTheProto 6950996460 crawling under + no under (lol) 
- crawling under tables
- no more unders spawn with jumpsuits (?)
 2022-04-26 17:10:31 -05:00
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
Artur 82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
SandPoot a8076257a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-18 22:56:09 -03:00
kiwedespars 56b0a49902 brain is like monkey, it forgets the newlines 2021-03-11 21:32:11 -08: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
SandPoot 98e11d88a9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-21 23:29:09 -03:00
dzahlus bf61249fcd new pain sounds 2021-02-18 04:38:02 +01:00
SandPoot e1e3ec8e9f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-14 19:08:22 -03:00
dzahlus a5f7718fe1 PLEASE I BEG YOU 2021-02-11 15:03:02 +01:00
dzahlus bbcc0a5a0d fixes travis error hopefully 2021-02-11 01:57:56 +01:00
dzahlus 80b607f7bd *pain 
AAWHG! Adds pain emote and respective sounds for male and female
 2021-02-04 19:59:57 +01:00
silicons 5b03f5b0ec more 2020-11-12 23:36:18 -07:00
SandPoot 7495575a6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-23 11:52:46 -03:00
Delams-The-SM 22f54dbc7d Adding hiss, purr and meow to emotes 2020-10-18 01:49:58 +02:00
SandPoot 8aad78b784 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:44:06 -03:00
silicons 1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
Enric Gabriel 7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03:00
SandPootandGitHub 13834c4bef Morrowinventory Port (#75) 2020-09-24 20:14:53 -03:00
Blue Wildrose 19f14b6608 error correction 
I'm a dummy
 2020-09-22 03:22:10 -07:00
Blue Wildrose 006a625504 Slimeperson screams and laughter! 2020-09-22 02:41:11 -07:00
silicons 1ea0dd9f76 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-09-19 15:56:13 -07:00
Timothy Teakettle b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
silicons 42db990836 why am i doing this 2020-08-03 13:37:37 -07:00
silicons 800825f9f7 squish 2020-06-24 11:02:47 -07:00
kevinz000 78fadafa05 alright 2020-06-17 21:44:49 -07:00
Timothy Teakettle 38bf529f3c a tonne of fixes 2020-06-11 20:18:36 +01:00
Timothy Teakettle 8ec5672b85 tonne of fixes 2020-06-10 21:14:08 +01:00
GhomandGitHub 968426fd48 Combat mode component. (#12338) 
* Combat mode component.

* Whoops.

* test.

* Oh

* refs begone, and documentation.
 2020-05-27 18:00:32 -07:00
GhomandGitHub 7c7147cb3e Field of Vision component. (#12075) 
* Hopeless WIP for vision cones.

* Core component and hooks done

* Removing clutter.

* linter bashing me for using statements as args.

* Ok.

* continue

* bring back the macro

* Configs and openspace filter.

* Chat plane, reset perspective signal, mechs/vehicles cases, machineries.

* view, viewers and spoopy ghosts.

* Renamed component, admin fun button and snowflakes robots.

* Whoopsie.

* Yikes

* test merge tweak.

* radial yaketi sax.

* Fixed tgui UIs, some messages not displayed to the target.

* Documentation and a little bugfix.

* Pulling QoL, seventh plane made in this PR.

* Fix.

* Tweaks and improvements.

* Update randomverbs.dm
 2020-05-15 15:25:04 -07:00
Ghommie e0b91c53af Purging unused dogborg items. 2020-05-10 22:17:05 +02:00
kevinz000andGitHub e6e2277634 Update damage_procs.dm 2020-04-30 01:07:40 -07:00
Ghommie 42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
kevinz000andGitHub ae27bf90e4 Merge pull request #11846 from Putnam3145/vore-optimization 
Optimizing vore + commenting out simplemob vore (sorry)
 2020-04-19 16:45:44 -07:00
GhomandGitHub 775948eed3 Merge pull request #11866 from Citadel-Station-13/kevinz000-patch-6 
Shuffles around and buffs resisting embedded objects
 2020-04-18 05:34:58 +02:00
Putnam d90e490bae Aaand updated with master 2020-04-17 18:57:36 -07:00
kappa-samaandGitHub e19f9c5c3e revert 2020-04-17 19:19:00 -04:00
kevinz000andGitHub 4f02c6f3c5 Merge pull request #11875 from Ghommie/Ghommie-cit683 
Fixing some dog tier issue.
 2020-04-17 05:40:50 -07:00
kevinz000andGitHub d1d3c1f773 Merge pull request #11880 from NopemanMcHalt/benohybrid-screem 
Allows xenohybrids to scream like xeno would
 2020-04-17 05:39:54 -07:00
Anonymous 9d6f013bde Makes Xenohybrids scream Xeno 
Because if they can hiss like xeno, why not screem like one?
 2020-04-16 14:23:16 +03:00
Ghommie 7193efa613 Fixing some doggie issues. 2020-04-16 05:29:17 +02:00
kevinz000andGitHub b69c0944c9 Update human.dm 2020-04-14 21:54:23 -07:00
kevinz000andGitHub 4e99c6bb28 Update damage_procs.dm 2020-04-11 08:24:57 -07:00
kevinz000 ca45514444 typos 2020-04-09 21:55:54 -07:00
kevinz000 3bfc62fbb9 dmg 2020-04-09 21:55:02 -07:00
kevinz000 300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000GitHubGhom
 		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