shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

2522 Commits

Author SHA1 Message Date
Ghommie
c0c130324e Some consistency tweaks. 2019-11-08 22:53:59 +01:00
Ghommie
298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Ghommie
03a7fc3818 rad flags fixes. 2019-11-08 19:15:58 +01:00
Seris02
b9238d0290 copying my file from my mac 
henk
 2019-11-08 20:14:41 +08:00
Seris02
6b774745b3 adds the rising bass file so I can port the file over from my mac 2019-11-08 20:06:42 +08: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
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
Ghommie
43014a8729 Riding component fix and hacky mood runtimes workaround. 2019-11-05 07:33:43 +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
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
Ghommie
8c31c1036d Porting objective code refactor 2019-11-04 22:05:04 +01: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
Ghommie
286b78c84c Minor ninja tweaks and stealth nerf. 2019-11-03 17:14:55 +01:00
kevinz000
0fa57f6102 Merge pull request #9660 from Ghommie/Ghommie-cit293 
Fixing riding component runtimes, how drifting...
 2019-11-03 06:19:56 -07:00
kevinz000
bd29bd1e36 Merge pull request #9668 from Putnam3145/starlight 
Gives ways for various slime-killing healing viruses not to do that.
 2019-11-03 06:18:01 -07:00
kevinz000
906c58d339 Merge pull request #9672 from Ghommie/Ghommie-cit299 
Obligatory changes for 513 support kevinz forgot about.
 2019-11-03 06:15:42 -07:00
kevinz000
3a2ce8c5ce Merge pull request #9679 from Ghommie/Ghommie-cit302 
Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co
 2019-11-03 06:14:13 -07:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Putnam
9506a78429 whoops replaced this var with a simpler check 2019-11-01 18:46:31 -07:00
Ghommie
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
Ghommie
a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +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
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie
05dc64fd0a Obligatory changes for 513 kevinz forgot about. 2019-10-30 21:47:33 +01:00
Putnam
bb197c2251 allows heal viruses not to hurt slimes 2019-10-30 01:34:03 -07:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
754bb888dc Merge pull request #9533 from JTGSZ/rpd-fix 
RPD flipping works again
 2019-10-29 21:28:10 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273 
ports anti-magic component code updates (holymelon sold separately).
 2019-10-29 21:26:03 -07:00
Ghommie
54f8c29005 Fixing riding component runtimes, how drifting... 2019-10-29 23:33:35 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
kevinz000
46dabe25bb Update storage.dm 2019-10-27 21:35:37 -07:00
kevinz000
d390dc30fd Update storage.dm 2019-10-27 20:35:27 -07:00
kevinz000
1211cf43e9 Update storage.dm 2019-10-27 20:25:07 -07:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
nik707
187ea6476b Merge pull request #9572 from Citadel-Station-13/canReachInto_1 
Fixes a bunch of CanReach/storage related bugs ("You can no longer stick your hands inside other people and take their things")
 2019-10-25 22:16:02 -05:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
4af2233c5f Merge pull request #9549 from Ghommie/Ghommie-cit252 
Fixes identity transfer not copying digi legs.
 2019-10-24 19:15:33 -07:00
kevinz000
9096f03ad3 Merge pull request #8654 from Ghommie/Ghommie-cit54 
ports in the Hilbert's Hotel.
 2019-10-24 19:07:33 -07:00
kevinz000
281b254066 Merge pull request #9594 from Hatterhat/patch-3 
Shoes can now hold all pistols
 2019-10-24 18:56:59 -07:00
BlackMajor
16998d8814 Merge pull request #9193 from Citadel-Station-13/kevinz000-patch-77 
Disables crit_threshold changes through mood
 2019-10-25 14:38:51 +13:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00