shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,331 Commits 5 Branches 0 Tags
a01f3213f59e24d92d1173b079e84a12ddad8e11
Commit Graph
5331 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
pubbyandCitadelStationBot a01f3213f5 Traitorbro gamemode 2017-09-17 18:03:12 -05:00
CitadelStationBot 3144e56730 Automatic changelog generation for PR #2814 [ci skip] 2017-09-17 12:03:34 -05:00
CitadelStationBotandPoojawa b09aa9d082 [MIRROR] Fixes stacking when crafting items (#2814) 
* Merge pull request #30746 from YPOQ/stackfix

Fixes stacking when crafting items

* Fixes stacking when crafting items
 2017-09-17 12:03:31 -05:00
CitadelStationBotandPoojawa ada383e629 [MIRROR] Clarifies the egyptian staff desc (#2811) 
* Clarifies the egyptian staff desc (#30765)

* Clarifies the egyptia staff desc

* I can't write

* Clarifies the egyptian staff desc
 2017-09-17 12:03:12 -05:00
CitadelStationBotandPoojawa 3c8f4ca032 [MIRROR] Monkeys are now more likely to become Gorillas (#2806) 
* Monkeys are now more likely to become Gorillas (#30775)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Monkey to Gorilla now more likely

* Monkeys are now more likely to become Gorillas
 2017-09-17 12:02:23 -05:00
CitadelStationBotandPoojawa f703adbdd2 [MIRROR] Finishes porting /VG/ instruments (#2809) 
* Merge pull request #30750 from ShizCalev/vg-instrument-port

Finishes porting /VG/ instruments

* Finishes porting /VG/ instruments
 2017-09-17 12:01:53 -05:00
CitadelStationBotandPoojawa 3a7640d436 [MIRROR] Fixes random gamemode instantiation (#2803) 
* Fixes random gamemode instantiation

* Fixes random gamemode instantiation
 2017-09-17 12:01:33 -05:00
CitadelStationBotandPoojawa 69c1d74f65 [MIRROR] Corrects killroom turf gas mixture (#2805) 
* Corrects killroom turf gas mixture

* Corrects killroom turf gas mixture
 2017-09-17 12:00:59 -05:00
CitadelStationBotandPoojawa acc2104068 [MIRROR] Adds href token to station name rejection (#2798) 
* Adds href token to station name rejection (#30740)

* Adds href token to station name rejection

* Update charter.dm

* Adds href token to station name rejection
 2017-09-17 12:00:39 -05:00
CitadelStationBot 81bf128197 Automatic changelog generation for PR #2807 [ci skip] 2017-09-17 12:00:20 -05:00
CitadelStationBotandPoojawa 768c90fc03 [MIRROR] Removes vine floors and their sprite (#2807) 
* Removes vine floors and their sprite (#30778)

* removes vine floors and their sprite

* Once more, with feeling

* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"

This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.

* Removes vine floors and their sprite
 2017-09-17 12:00:19 -05:00
CitadelStationBotandPoojawa 08083581c3 [MIRROR] (Hopefully) Lessens preferences and manifest injection lag (#2796) 
* (Hopefully) Lessens preferences and manifest injection lag

* Update datacore.dm

* Update preferences_setup.dm
 2017-09-17 11:59:40 -05:00
CitadelStationBotandPoojawa cbfee7e313 [MIRROR] Tank gauge rounding fix (#2800) 
* Merge pull request #30749 from ShizCalev/tank-display-fix

Tank gauge rounding fix

* Tank gauge rounding fix
 2017-09-17 11:58:50 -05:00
CitadelStationBotandPoojawa 1cca85a58e [MIRROR] Fixes null modes being picked (#2802) 
* Fixes null modes being picked

* Fixes null modes being picked
 2017-09-17 11:58:33 -05:00
CitadelStationBotandPoojawa d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808) 
* PDA game log entry contains ckey

* PDA game log entry contains ckey
 2017-09-17 11:58:11 -05:00
PoojawaandGitHub dd4f68dfee Cleans up .rej spam and the empty file from #2792 (#2818) 
* Cleans up .rej spam and the empty file from #2792

* Update tgstation.dme
 2017-09-17 11:56:55 -05:00
LetterJayandGitHub 9e0f4c402b Merge pull request #2792 from Citadel-Station-13/upstream-merge-30729 
[MIRROR] Deletes empty file
 2017-09-17 08:56:42 -05:00
LetterJayandGitHub d0a4eb0808 Merge pull request #2790 from Citadel-Station-13/upstream-merge-30727 
[MIRROR] Fixes ReportDeath runtime
 2017-09-17 08:56:07 -05:00
CitadelStationBot 6347b84d4a Automatic changelog generation for PR #2702 [ci skip] 2017-09-17 08:55:42 -05:00
LetterJayandGitHub 4312b93ad2 Merge pull request #2702 from Citadel-Station-13/upstream-merge-30548 
[MIRROR] Magic Ladder
 2017-09-17 08:55:41 -05:00
PoojawaandGitHub 7cf4d0797b Applies WRITE_FILE to Citadel saves + Belly clone fix (#2694) 
* Applies WRITE_FILE to everything

* Maybe this works, actually

* HAHAH I FIXED IT FUCKOS
 2017-09-17 02:26:27 -05:00
CitadelStationBotandPoojawa a9d42c9051 [MIRROR] Fix clothing crafting menu for realsies this time (#2812) 
* Fix clothing crafting menu for realsies (#30776)

* Fix clothing crafting menu for realsies this time
 2017-09-16 20:25:42 -05:00
PoojawaandGitHub ad7c927208 Update mutations.dm 2017-09-16 10:44:22 -05:00
PoojawaandGitHub 71719f6787 Update _computer.dm 2017-09-16 09:19:47 -05:00
PoojawaandGitHub 15db46af10 Update dogborgstuff.dm 
removes PAI from protected, add bomb cores. christ people are memes.
 2017-09-16 08:22:50 -05:00
CitadelStationBot 7997ac2b67 Automatic changelog generation for PR #2783 [ci skip] 2017-09-16 04:46:42 -05:00
CitadelStationBotandPoojawa d2db21dbdf [MIRROR] Ninja adrenaline boost removes stamina damage (#2783) 
* Merge pull request #30704 from YPOQ/boost

Ninja adrenaline boost removes stamina damage

* Ninja adrenaline boost removes stamina damage
 2017-09-16 04:46:41 -05:00
PoojawaandGitHub 29c116f491 disables genetics-aquireable hulk until nerfed 2017-09-16 04:43:54 -05:00
CitadelStationBotandPoojawa e4af04823a [MIRROR] Fix pressure plate spam (#2775) 
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
 2017-09-16 04:35:45 -05:00
CitadelStationBot 927e89ec7a Automatic changelog generation for PR #2791 [ci skip] 2017-09-16 04:33:17 -05:00
CitadelStationBotandPoojawa 956efbef27 [MIRROR] Removes corgis as a facehugger target (#2791) 
* Removes corgis as a facehugger target (#30719)

* Removes corgis as a facehugger target
 2017-09-16 04:33:16 -05:00
CitadelStationBot 9d32452727 Automatic changelog generation for PR #2784 [ci skip] 2017-09-16 04:32:21 -05:00
CitadelStationBotandPoojawa 1db4249fa1 [MIRROR] Adds Abandoned Airlocks (#2784) 
* Adds Abandoned Airlocks (#30705)

* Automatic changelog generation for PR #30056 [ci skip]

* Delete AutoChangeLog-pr-30056.yml

* Abandoned Airlocks

* Added to maps

* inclusive numbering

* Update airlock.dm

* Tweaks

* Capital ChangeTurf

* Update airlock.dm

* no more update_icons

* Abandoned paths (#4)

* Abandoned paths

* Cleaned up dirty var

* Adds Abandoned Airlocks
 2017-09-16 04:32:19 -05:00
CitadelStationBot 20727bffb3 Automatic changelog generation for PR #2789 [ci skip] 2017-09-16 04:31:48 -05:00
CitadelStationBotandPoojawa a91f7efe5e [MIRROR] Fixes the doomsday device announcements (#2789) 
* Fixes the doomsday device announcements

* Fixes the doomsday device announcements
 2017-09-16 04:31:46 -05:00
CitadelStationBotandPoojawa ccd55bb779 [MIRROR] Remove /obj/proc/gang_contraband_value (#2799) 
* Remove /obj/proc/gang_contraband_value() (#30744)

unused

* Remove /obj/proc/gang_contraband_value
 2017-09-16 04:31:22 -05:00
CitadelStationBot dbffd52f16 Automatic changelog generation for PR #2759 [ci skip] 2017-09-16 04:29:24 -05:00
PoojawaandGitHub 0eb8cf0235 Icon_override, Plasma weapon tweaks & gunlocker. AK-47 Summoning (#2759) 
* In hands of plasma weapons/tweaks

* Icon override states for all clothes

* a few compile issues ~

* Adds a new badmin button and plasma rifle case

* better cleanup of the sound effect

* Oh, these should've been deleted already.
 2017-09-16 04:29:22 -05:00
Poojawa 54d28cadb0 Screen alerts weren't ported in #2644 2017-09-16 03:24:24 -05:00
LeoandCitadelStationBot dffe980a6b Deletes empty file 2017-09-15 07:07:41 -05:00
CitadelStationBotandPoojawa 119828bb59 [MIRROR] Fixes get_area not working on areas (#2788) 
* Fixes get_area not working on areas

* Fixes get_area not working on areas
 2017-09-15 05:52:39 -05:00
CitadelStationBot fb799bb84e Fixes ReportDeath runtime 2017-09-15 05:15:07 -05:00
AnturKandCitadelStationBot 556e6806f8 Fixes ReportDeath 2017-09-15 05:15:06 -05:00
CitadelStationBotandPoojawa ca2665a128 [MIRROR] gives the krebs a new sprite (#2761) 
* gives the krebs a new sprite

* Update crab.dm
 2017-09-15 03:35:56 -05:00
CitadelStationBot ee656543ce Automatic changelog generation for PR #2782 [ci skip] 2017-09-15 03:35:30 -05:00
CitadelStationBotandPoojawa 40a34e2a63 [MIRROR] Fixes evidence bags showing ghost contents after their contents get deleted (#2782) 
* Merge pull request #30702 from vuonojenmustaturska/evidencebags

Fixes evidence bags showing ghost contents after their contents get deleted

* Fixes evidence bags showing ghost contents after their contents get deleted
 2017-09-15 03:35:29 -05:00
CitadelStationBotandPoojawa fe00ad6b4b Remaps vuonojenmustaturska to Naksu (#2776) 2017-09-15 03:34:39 -05:00
CitadelStationBotandPoojawa 941f63e7f9 [MIRROR] Adds a tip to examine for L6 SAW machinegun (#2779) 
* Merge pull request #30724 from JJRcop/saw_that_but_didnt_see_that

Adds a tip to examine for L6 SAW machinegun

* Adds a tip to examine for L6 SAW machinegun
 2017-09-15 03:34:15 -05:00
CitadelStationBotandPoojawa 4dffe75a30 [MIRROR] Syndicate Borgs now show up as Syndicate Borgs in Check Antags (#2781) 
* Merge pull request #30713 from ExcessiveUseOfCobblestone/patch-3

Syndicate Borgs now show up as Syndicate Borgs in Check Antags

* Syndicate Borgs now show up as Syndicate Borgs in Check Antags
 2017-09-15 03:33:50 -05:00
CitadelStationBotandPoojawa 79ae8d8829 [MIRROR] Ports chasm exceptions to typecaches (#2777) 
* Ports chasm exceptions to typecaches (#30717)

* Ports chasm exceptions to typecaches

* Ports chasm exceptions to typecaches
 2017-09-15 03:24:57 -05:00