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
54,249 Commits 55 Branches 0 Tags
5116acad15f301d528039606cb63af6bff3bbcf2
Commit Graph

137 Commits

Author SHA1 Message Date
BongaTheProto
5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05:00
KrissKr0ss
66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
Darius
f2cf15c590 Refactor Dumb For Cum quirk 
This commit makes the following changes
- Adds comments
- Adds trait TRAIT_DUMB_CUM
- Adds mood quirk flag
- Adds quirk removal code
- Removes non-modular edits
- Renames trait TRAIT_DUMB4CUM to TRAIT_DUMB_CUM_CRAVE
- Removes interaction blocks
- Removes useless return functions
- Updates flavor text
- Updates variable names
- Changes reagent process to check for trait before triggering uncrave
- Changes on_spawn event to add event
 2023-02-02 17:21:54 -05:00
Jerry Wester
ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
PeriodicChaos
b538ad721b modsuits part 2 2022-12-11 20:30:58 -07:00
BongaTheProto
9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
Hatterhat
959fa45d3c client prefs! per-gun recoil multipliers! 2022-08-05 16:00:19 -05:00
Hatterhat
670bda0e29 it works 2022-08-03 06:01:35 -05:00
WoolyAypa
9c94cad910 modularization and removed the is_dumb4cum proc 2022-06-17 14:03:48 -03:00
WoolyAypa
af3df23c49 dumb4cum that is 2022-06-17 02:46:28 -03:00
BongaTheProto
6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -05:00
deathride58
1a918ed8db animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game 2022-05-31 19:22:30 -04:00
BongaTheProto
93016e7568 Merge branch 'Sandstorm-Station:master' into master 2022-02-16 16:03:32 -05:00
silicons
ce6e8c99c6 fixes 2022-02-15 21:56:36 -07:00
BongaTheProto
a55db74f83 Merge pull request #53 from dragonbird13/master 
New lavaland ghostrole - Wandering Hermit. Ghostroles can be spawned with additional language from Speech Preferences.
 2021-12-05 18:16:28 -05:00
Crowbar764
251c015dc8 Merge branch 'master' into slaver-antag 2021-12-05 19:59:35 +00:00
dragonbird13
fb23b7592c New ghostrole, new location and ghostsroles can spawn with additional language from preference 2021-12-06 00:05:58 +05:00
dragonbird13
ffaa21836b appearance loader final bugfixes 2021-12-05 02:13:54 +05:00
dragonbird13
a14b4dac51 Returning our own characters on ghostroles! (Ported from Hyper). Now have to add var canloadappearance = TRUE to every ghostrole spawners which allowed to spawn humanlikes 2021-12-04 03:09:00 +05:00
James
f3726aba32 Added slave collars, slave console and modified comms console 2021-12-02 17:01:23 +00:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
uomo91
6b0435e7b5 Port. 2021-01-01 00:46:47 -06:00
uomo91
be009f2e54 Better labeling to differentiate log types. 2020-11-18 06:08:14 -06:00
uomo91
82869f4aef Fix timestamp proc. 2020-11-16 01:48:48 -06:00
uomo91
9a6759efaa Remove unneeded linecount thing. 2020-11-16 01:39:08 -06:00
DeltaFire
4146566af0 hoo boy 
replaces all mentions of bodypart_robotic with is_robotic_limb() where possible, adds BODYPART_HYBRID, adds helpers for organic / robotic limbs (is_robotic_limb() / is_organic_limb(), with a arg to override it accepting hybrid limbs)
Also makes the the surgery to heal robotic limbs work if the torso isn't a robot, but rather if there are robotic bodyparts, makes the IPC brain repair.. only accept IPC brains (obviously), makes the damage threshholds for robo-limbs vars instead of a fix 25 with hybrid ones predefined at 25 / 15 (trigger / mindamage), adds an error message to fixing them if already at theshhold, etc. Now just for replacing BODYPART_ORGANIC with is_organic_limb aswell where applicable.. also actual values for the other robo limbs. Fun!
 2020-10-06 17:34:13 +02:00
raspy-on-osu
c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
Artur
20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Artur
3c973816d1 Ports https://github.com/tgstation/tgstation/pull/51125/ 2020-05-27 12:48:25 +03:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
Ghom
1e57664a99 Merge pull request #10934 from kevinz000/actual_ghost_newscasters 
Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)
 2020-02-14 19:21:48 +01:00
kevinz000
c790478a3d Merge pull request #11012 from keronshb/RatvarDrink 
Introduces the Ratvarian mixed drink, the CogChamp!
 2020-02-12 23:58:14 -07:00
keronshb
42fda3d88b CogChamp 
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
 2020-02-10 21:18:51 -05:00
kevinz000
520dd57bf9 Update mob_helpers.dm 2020-02-10 04:33:27 -07:00
kevinz000
276f4b5fae Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters 2020-02-10 04:32:01 -07:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
927b9d0622 Revert "Merge pull request #10883 from ancientpower/ghost-newscasters" 
This reverts commit 3c5a3cb4d4, reversing
changes made to 109b15ebdd.
 2020-02-05 23:50:41 -07:00
kevinz000
3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters 
Allows ghosts to read newscasters and books
 2020-02-05 23:46:04 -07:00
Seris02
6cc6aa12be yeehaw it's done 2020-02-05 16:54:57 +08:00
Seris02
49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
ancientpower
5aecdb6a4d initial commit 2020-02-03 20:10:39 -06:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
0d1e458e9c yuh 2020-01-27 08:32:45 +08:00
Seris02
934c8fe533 updates + thingamajig 2020-01-23 15:25:45 +08:00
Seris02
74be93a8cc hasSiliconAccessInArea vars change 2020-01-21 11:44:49 +08:00
Seris02
04b34ec8ed hijack implant 2020-01-18 18:04:31 +08:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00