shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,831 Commits 5 Branches 0 Tags
07a5f052d36bdc33ccef0f5ef4141d94d280c5fb
Commit Graph

11491 Commits

Author SHA1 Message Date
Lin
512939f1e6 Merge pull request #9730 from Citadel-Station-13/kevinz000-patch-112 
kinetic crushers no longer drop if you try to use it with one hand
 2019-11-19 03:23:12 +00:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
63a3919ed2 Fixing gasping xenos. 2019-11-18 20:58:22 +01:00
Ghommie
d5e7f77c13 A 2019-11-18 18:47:34 +01:00
Ghommie
bddb437872 It works now. 2019-11-18 18:30:46 +01:00
Ghommie
21c1f8bc2a Fixing suit store overlays 2019-11-18 15:19:39 +01:00
Ghommie
ec4e3898eb Fixing some wizard den teleportation issues. 2019-11-18 02:04:49 +01:00
Ghommie
6e9d2d57c0 check_shields from human to living, part 2 2019-11-17 22:06:19 +01:00
Anonymous
b714c32ca2 Partly Reverts "Fixes loadout name, adds DAB outf- 
it crate to cargo"

This reverts commit 1bb8ff1c0c.
Removes cargo changes.

In other news, I can't please everyone and I hate society,
thank you for coming to my TED Talk.
 2019-11-17 19:44:22 +03:00
NopemanMcHalt
8f7571a115 Don't do webedits, folks 
I mean seriously it's quick but there's chance of fucking up something
 2019-11-17 18:18:20 +03:00
Seris02
468b6eb609 mining winter coat shtuff 
- adds the mining winter coat to mining wardrobes and mining lockers
 2019-11-17 22:27:09 +08:00
Putnam
ba091b3a27 limited midround wizard summon events possibilities 2019-11-17 05:56:19 -08:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9 cosmic winter coat yeeeehaw 2019-11-17 20:06:01 +08:00
Seris02
86a576e644 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-17 15:45:35 +08:00
Seris02
7d99508bd0 adds janitor winter coat 2019-11-17 15:45:12 +08:00
Ghommie
5d06ea5d48 o 2019-11-17 07:16:53 +01:00
Ghommie
b560ff8284 refactoring code to allow all living mobs to use shields. 2019-11-17 06:23:12 +01:00
Seris02
b7f4580414 robotics winter coat 2019-11-17 11:50:56 +08:00
Ghommie
773b3e6605 Oh yea, now I remember why I did not port the webedit.. bhjiiiiiiin! 2019-11-17 04:11:37 +01:00
Ghommie
641ddebed1 Ports "Uses defines for turf atmos" 2019-11-17 03:19:35 +01:00
Ghommie
6d6cc93e50 Ports "Self sustaining fix" 2019-11-17 02:59:38 +01:00
lolman360
4d71f95b16 Merge branch 'master' into HeadCorgi 2019-11-17 12:24:04 +11:00
lolman360
8a54a73be4 e 2019-11-17 12:12:46 +11:00
lolman360
aed866339f pickup pickup pickup pickup 100% pickup 2019-11-17 12:00:17 +11:00
DeltaFire
df4ae7ea18 Just some fixes 
Fun fun fun
 2019-11-16 21:11:08 +01:00
DeltaFire
3f36a0096c Bruh moment 
fixes a missing bracketty boi
 2019-11-16 20:45:23 +01:00
DeltaFire15
350dd6ed3a Sync with master (#3) 
Alot of stuff, honk
 2019-11-16 16:03:25 +01:00
DeltaFire
3d8c41e143 Changes up the blood stunhand against hostile cultists 
The stunhand used by bloodcult will no longer hardstun + deal damage to hostile cultists. Instead, it will deal some brute + debuff the enemy cultist, duration of the debuffing is a bit longer then for the clockie kindle since that one also applies belligerent.
Also fixes up some stuff / adds a safety check in the clockie changes
 2019-11-16 15:49:21 +01:00
Seris02
b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
kevinz000
d9b24b20d1 Merge pull request #9817 from Ghommie/Ghommie-cit357 
Fixing a keybinding issue.
 2019-11-16 03:02:43 -07:00
Seris02
8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08:00
Putnam
a85142053d Makes it refund threat too (wow, didn't even think about it!) 2019-11-16 00:43:44 -08:00
Putnam
c9de03675e actually no i'm reworking this 2019-11-16 00:36:09 -08:00
kevinz000
21775ad3ee Merge pull request #9813 from Ghommie/Ghommie-cit355 
Ports "Ghosts can now see the AI's camera" and "Removes error message while shunting [fix]"
 2019-11-16 01:24:58 -07:00
kevinz000
66f8b5f404 Merge pull request #9769 from Ghommie/Ghommie-cit336 
ID console fixes and other tweaks.
 2019-11-16 01:17:23 -07:00
Seris02
e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08:00
GrayRachnid
c1dfa4227b ok this works and i don't know why 2019-11-16 00:52:52 -05:00
GrayRachnid
206f3df25c i hate dogborgs and pixel_x 2019-11-16 00:41:55 -05:00
DeltaFire
57027661a9 Changes blood halberd to no longer hardstun hostile cult when thrown 
It will now, simillar to the Ratvarian counterpart, instead apply damage and some confusion, plus some weak knockdown.
 2019-11-16 04:51:59 +01:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Ghommie
7a1f3dcdba Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor. 2019-11-15 23:14:28 +01:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
Ghommie
978b675986 FUCK 2019-11-15 20:12:54 +01:00
Ghommie
2b104a7698 Ports "Fixes MMIs not being able to use mecha equipment" 2019-11-15 18:40:45 +01:00
DeltaFire
85b0cb37b8 Little typofix 
Bruh
 2019-11-15 18:12:57 +01:00
DeltaFire
d34ef11bac Some more changes to clock stuff 
Adds some flavor for the kindle spell, changes the transgression sigil to burn cultists instead of stunning, adds belingerent debuff to spearthrow and kindle attack when used on hostile cultists
 2019-11-15 18:01:42 +01:00
Putnam
4f06a25951 Made staff of change require/cost threat 2019-11-14 23:26:59 -08:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
lolman360
57bd0f5fb8 Revert "DDDDDDDDDDDDDDDDDDDDDDDDDDDDDROIIIIIIIIIIIIIIIIDS" 
This reverts commit bc6c617c27.
 2019-11-15 16:42:34 +11:00