shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,662 Commits 5 Branches 0 Tags
bd650e53daea0a8fcfffd613a7a0ee61686a3fdf
Commit Graph

3276 Commits

Author SHA1 Message Date
kevinz000
8c247a566a Merge pull request #9783 from Ghommie/Ghommie-cit343 
Fixing Aux base camera RCD door settings and toggle window type actions.
 2019-11-14 16:22:08 -07:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281 
Porting multi-z support updates.
 2019-11-14 15:58:53 -07:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
kevinz000
8f08e1017e Merge pull request #9688 from Ghommie/Ghommie-cit306 
Fixing gibspawner runtimes and improving them, how gruesome...
 2019-11-14 15:51:20 -07:00
kevinz000
d8e89b235f Merge pull request #9689 from Ghommie/Ghommie-cit307 
How many times I have encountered this sort of issue in the past and how much of a meme it was...
 2019-11-14 15:50:52 -07:00
kevinz000
af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226 
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
 2019-11-14 15:47:18 -07:00
kevinz000
dfa2296758 Merge pull request #9430 from Ghommie/Ghommie-cit220 
Ports "Adds three new .38 ammo types", also lazily adding .357 AP
 2019-11-14 15:44:59 -07:00
kevinz000
487f98bf68 Merge pull request #9775 from Ghommie/Ghommie-cit340 
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
 2019-11-14 01:40:16 -07:00
kevinz000
3015ec5c04 Merge pull request #9764 from Ghommie/Ghommie-cit335 
Dreamchecker compatibility changes, part 1.
 2019-11-14 01:37:41 -07:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
kevinz000
4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331 
lentext to length, yet another 513 requirement.
 2019-11-12 23:59:31 -07:00
kevinz000
e142ed03dd Merge pull request #9773 from Ghommie/Ghommie-cit339 
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
 2019-11-12 23:58:15 -07:00
kevinz000
8920930679 Merge pull request #9765 from dapnee/let's-fix-lockers 
Ports Closet & Crate Initialization Fixes
 2019-11-12 23:57:39 -07:00
kevinz000
a16219d97a Merge pull request #9772 from DeltaFire15/weh 
Adds eight new plushies to the game while integrating kevs' plush PR
 2019-11-12 23:56:01 -07:00
Ghommie
4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie
c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
DeltaFire
4d4d495765 Hmm I wonder if anyone would notice if I smuggled another plush into this PR 
What it says on the tin, got asked via dms to add another plush to my PR so here we go.
Char is Minty.
 2019-11-12 15:32:06 +01:00
Ghommie
aad2b5bcd5 Fixing Aux base camera/drone RCD actions. 2019-11-12 04:35:10 +01:00
Ghommie
e50c56150e ports "Adds superlube to the clown ruin" and buffs clown PDAs 2019-11-11 23:10:22 +01:00
Ghommie
d06b6fd83e Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP) 2019-11-11 21:34:47 +01:00
DeltaFire
421be859fb Ok nice typo gang 2019-11-11 21:08:32 +01:00
DeltaFire
51aacedb9f Little fix 2019-11-11 18:17:07 +01:00
DeltaFire
3d2986fd06 Fixes the sin plush sprite + MORE PLUSHIES 
What it says on the label, fixes the sin plushie sprite as the size was wrong previously and adds two more lizzers

Also fixes a typo weh
 2019-11-11 17:32:06 +01:00
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
DeltaFire
1c6c188033 Exo plush 
Adds a AI plushie for exo since this PR is slowly getting filled with plushies
guaranteered non-malf!
 2019-11-11 01:05:16 +01:00
Ghommie
4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
DeltaFire
56720ea99c Merging kevinz's plush PR into mine 
Adds the kara plushie, the new skylar sprite and the trillby fix into the code, all without any missing syntax elements! Yay!
 2019-11-10 22:27:06 +01:00
Dap
041c35202b Ports Closet & Crate Initialization Fixes 
Ports a similarly named pull request (thank you cool cat).
 2019-11-10 14:17:34 -07:00
Ghommie
1e49ce76d3 Dreamchecker compatibility changes, part 1. 2019-11-10 20:48:30 +01: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
e8219dd9f7 Merge pull request #9697 from Poojawa/patch-1 
Better Health Analyzer formatting
 2019-11-10 11:35:07 -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
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
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
DeltaFire
7ab4d2f013 Viva la wehvolution 
Adding the plushies code after syncing with ros's changes
 2019-11-10 17:39:43 +01:00
Ghommie
279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00
TrilbySpaceClone
0662245d80 corrections 2019-11-06 22:52:44 -05:00
Ghommie
892b66470b Fixing several minor runtimes. 2019-11-05 23:07:29 +01:00
rosko
cc8423ac45 adds a lizzard plushie 
yet another player plushie....this one comes with a real fake maxcap
 2019-11-05 20:38:44 +02: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
4ab3512dda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-04 23:15:12 +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
1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01: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
TrilbySpaceClone
82b148b7b7 Merge branch 'master' into Cargo_MKII 2019-11-03 17:53:06 -05:00
Trilbyspaceclone
9af899c9c3 cleaning up 2019-11-03 12:59:41 -05:00