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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,464 Commits 55 Branches 0 Tags
63da5ffb138ab9e29b19ca8441da3b451d04f573
Commit Graph

16115 Commits

Author SHA1 Message Date
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
kevinz000
c4849ead74 Merge pull request #9727 from BlackMajor/Yeehaw 
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
 2019-11-10 11:46:03 -07:00
kevinz000
39e55edcb3 Merge pull request #9734 from Ghommie/Ghommie-cit324 
Ports CEV-eris delivery packages sprites, also dunking old syndie cybernetics box sprite.
 2019-11-10 11:45:47 -07:00
kevinz000
07447917de Merge pull request #9744 from Seris02/meteorhallucinations 
makes meteor hallucinations have an ETA now
 2019-11-10 11:44:41 -07:00
kevinz000
76e31a2799 Merge pull request #9745 from Ghommie/Ghommie-cit327 
rad flags fixes.
 2019-11-10 11:44:17 -07:00
kevinz000
95b98a5133 Merge pull request #9746 from Ghommie/Ghommie-cit328 
Ports "Cleans up the new alt clicking functionality" from /tg/
 2019-11-10 11:43:41 -07:00
kevinz000
48fb3a0f08 Merge pull request #9694 from kappa-sama/hosnowflake 
Buffs security, nerfs antags
 2019-11-10 11:40:41 -07:00
kevinz000
92455b5b8c Merge pull request #9695 from Ghommie/Ghommie-cit311 
Unmodularize and update pAI/Intellicards very slighty.
 2019-11-10 11:40:14 -07:00
kevinz000
814321beeb Merge pull request #9696 from Ghommie/Ghommie-cit312 
clock welder overlay fix.
 2019-11-10 11:39:54 -07:00
kevinz000
e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1 
Better Health Analyzer formatting
 2019-11-10 11:35:07 -07:00
kevinz000
d1f6483687 Merge pull request #9704 from Ghommie/Ghommie-cit314 
Minor ninja tweaks and stealth nerf.
 2019-11-10 11:31:25 -07:00
kevinz000
e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets 
Port Welding Hard Hats from /tg/
 2019-11-10 11:30:54 -07:00
kevinz000
487e1806e7 Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 
Adds 8 more sci crates to cargo
 2019-11-10 11:30:33 -07:00
kevinz000
7b6604108f Merge pull request #9713 from Trilbyspaceclone/sprite-issues 
Makes catnip have sprites
 2019-11-10 11:28:49 -07:00
kevinz000
23cd6b7604 Merge pull request #9714 from Ghommie/Ghommie-cit315 
Fixing a few throw_at calls and modular computer processors Init.
 2019-11-10 11:28:26 -07:00
kevinz000
501dfbb43a Merge pull request #9715 from Ghommie/Ghommie-cit316 
Ports CEV-Eris resprited matchbox, also respriting cigar boxes myself.
 2019-11-10 11:27:36 -07:00
kevinz000
1493863533 Merge pull request #9716 from Ghommie/Ghommie-cit317 
Porting objective code refactor (ergo fixing abductors/abductees objective by updating the code)
 2019-11-10 11:27:04 -07:00
kevinz000
c46b425402 Merge pull request #9719 from Ghommie/Ghommie-cit318 
Renames is_hot and is_sharp to get_temperature and get_sharpness, just like how ol tg did.
 2019-11-10 11:26:06 -07:00
kevinz000
4fc10d436d Merge pull request #9721 from Ghommie/Ghommie-cit319 
Unmodularize secway and turfs
 2019-11-10 11:25:50 -07:00
kevinz000
3570df6084 Merge pull request #9726 from Ghommie/Ghommie-cit323 
Fixing several minor runtimes.
 2019-11-10 11:10:16 -07:00
kevinz000
d47f1f0518 Merge pull request #9756 from Ghommie/Ghommie-cit332 
turns on the chat subsystem (#47653)
 2019-11-10 11:03:53 -07:00
BlackMajor
2c9af44ce3 Merge pull request #9724 from Ghommie/Ghommie-cit322 
Fixes free real estate paraplegic trait and bolas.
 2019-11-10 17:10:45 +13:00
tralezab
354a257641 turns on the chat subsystem (#47653) 2019-11-10 00:05:59 +01:00
Ghommie
84258c6e73 This is useless actually. 2019-11-08 19:39:52 +01:00
Ghommie
4819cdc228 mistakes were made. 2019-11-08 19:29:52 +01:00
Ghommie
297ee03175 Ports "Cleans up the new alt clicking functionality" from /tg/ 2019-11-08 19:25:09 +01:00
Ghommie
03a7fc3818 rad flags fixes. 2019-11-08 19:15:58 +01:00
Seris02
a5a483fb8a makes meteor hallucinations have an ETA now 2019-11-08 19:55:27 +08:00
BlackMajor
aaff0bf9e7 Merge pull request #9705 from kappa-sama/patch-4 
thanks major
 2019-11-08 14:17:59 +13:00
BlackMajor
a6bbe75c36 Merge pull request #9611 from Citadel-Station-13/supply-passive-gen 
Adds passive point generation to cargo. Nerfs miasma selling. Increases mindshield crate price.
 2019-11-08 14:17:17 +13:00
Ghommie
509fbdf476 initial. 2019-11-07 05:34:02 +01:00
Ghommie
3c6b1109f1 I'm tired. 2019-11-07 00:40:39 +01:00
Ghommie
ae6e50b081 resprited delivery packages. 2019-11-06 18:27:33 +01:00
BlackMajor
026f9758b9 Actually wait that's way simpler 2019-11-06 12:55:25 +13:00
BlackMajor
960de09a96 Oh there's even more 2019-11-06 12:49:50 +13:00
BlackMajor
9efddbe580 thank you dark souls 2019-11-06 12:47:21 +13:00
Ghommie
97dd0bd70c Yes. 2019-11-05 23:13:10 +01:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
ae9ff92d33 Fixes free real estate paraplegic trait and bolas. 2019-11-05 18:03:50 +01:00
Ghommie
9cac543a2b Unmodularize secway and turfs 2019-11-05 05:47:25 +01:00
Ghommie
a650e1e411 Ports "Renames is_hot and is_sharp to get_temperature and get_sharpness" 2019-11-05 05:37:28 +01:00
Trilbyspaceclone
09cd439f85 so dumb that github suggestions brake " 2019-11-04 17:24:37 -05:00
Trilbyspaceclone
061579decb no fun allowed 2019-11-04 17:08:55 -05:00
Trilbyspaceclone
28b96494e6 huh 2019-11-04 17:03:00 -05:00
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01:00
Ghommie
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
Trilbyspaceclone
cb215be40d Apply suggestions from code review 
dap the hero

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-11-04 07:21:30 -05:00
TrilbySpaceClone
ae8b43e1c0 Update tea_coffee.dm 2019-11-04 06:05:10 -05:00
TrilbySpaceClone
526d9b203c aliens 
man
 2019-11-04 00:34:03 -05:00
BonniePandora
5efed32095 Ports Welding Hard Hats from /tg/ 
Changelog:
modules/clothing/head/Hardhat.dm:
-Added Welder Hard Hats & various colours
--They function as a combi hard hat & welder mask, but have a slightly dimmer head lamp
modules/clothing/vending/wardrobes.dm
-Added 3 Welder Hard Hats to the Engi-drobe and Atmos-drobe
-Equalized some values between the two (3 atmos winter coats now instead of 5, and 3 engineering dufflebags instead of 2)
game/objects/structures/crates_lockers/closets/secure/engineering.dm
-Replaced the welding mask in the CE's locker with a white WHH (This one has brighter buld in it! Same brightness as a regular hard hat)
datums/action.dm
- Added the item_action to lower the WHH's face shield
icons/mob/head.dmi
-Added weldervisor + welderhat, which are used by the WHH's
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
icons/mob/obj/hats.dmi
-Added weldervisor, again, used by the WHH's
-Repositioned the hardhat sprites up several pixels so they don't clip and look weird with the weldervisor
-Recoloured hardhat0/1_dblue to be in atmos colours as I've never seen it on the station before and this way is actually used
 2019-11-04 02:29:56 +00:00