shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,692 Commits 5 Branches 0 Tags
6d59f3b06f2f6eb87fa6f0debc667fb540e7dcd5
Commit Graph
1636 Commits
Author SHA1 Message Date
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
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
RobustinandCitadelStationBot 422373e649 Dice will now roll when thrown 2017-09-16 11:37:38 -05:00
PoojawaandGitHub 71719f6787 Update _computer.dm 2017-09-16 09:19:47 -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
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
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
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
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
KorPhaeronandCitadelStationBot d104c1d76c Prevents the creation of Shadowzombiechangelings 2017-09-15 03:08:07 -05:00
CitadelStationBotandPoojawa af0080b00b [MIRROR] Stops ranged stack splitting (#2785) 
* Merge pull request #30695 from KorPhaeron/magicstacks

Stops ranged stack splitting

* Stops ranged stack splitting
 2017-09-15 02:51:53 -05:00
CitadelStationBotandPoojawa f07369aead [MIRROR] Fixes nuking the syndicate base (#2767) 
* Merge pull request #30694 from KorPhaeron/syndie_nuke

Fixes nuking the syndicate base

* Fixes nuking the syndicate base
 2017-09-14 13:24:43 -05:00
CitadelStationBotandPoojawa 7d34286803 [MIRROR] Fixes a bunch of computers (#2766) 
* Fixes a bunch of computers (#30693)

* Fixes a bunch of computers
 2017-09-14 13:23:01 -05:00
CitadelStationBotandPoojawa 3516f4ef0a [MIRROR] turf now checks for inheritance, this is the future! (#2770) 
* Turfs call ..() in attackby (#30707)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* ok this works

* ok this works

* turf now checks for inheritance, this is the future!
 2017-09-14 13:18:01 -05:00
CitadelStationBotandPoojawa c6b9892dc0 [MIRROR] Fixes potted plants putting you above wall objects (#2754) 
* Merge pull request #30676 from ShizCalev/plant-layer-fix

Fixes potted plants putting you above wall objects

* Fixes potted plants putting you above wall objects
 2017-09-14 07:39:13 -05:00
CitadelStationBotandPoojawa 40f5d7d4bf [MIRROR] Fixes wash_obj misuse (#2753) 
* Fixes wash_obj misuse (#30658)

* Fixes wash_obj misuse

* This too

* Ree

* REEEEE

* Fixes wash_obj misuse
 2017-09-14 07:38:51 -05:00
CitadelStationBotandPoojawa 82861d208b [MIRROR] Fixes lighting hard deleting (#2760) 
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
 2017-09-14 06:44:17 -05:00
CitadelStationBotandPoojawa 099b6628fa [MIRROR] Full jobs will no longer be shown as priority for latejoiners (#2729) 
* Full jobs will no longer be shown as priority for latejoiners

* Update card.dm
 2017-09-13 22:54:41 -05:00
CitadelStationBotandPoojawa e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBotandPoojawa b4c27d5533 [MIRROR] Chainsaws now have a suicide! (#2734) 
* Chainsaws now have a suicide! (#30559)

* i have the power !!

thanks, cobby!

* help my code is growing out of control

i'm not even touching the keyboard anymore

* do you like.... my car

* nobody saw that, compile BEFORE you commit kids

* LITERALLY THE BEST COMMIT OF ALL TIME

THANKS AGAIN COBBY FOR FIXING IT UP

* FINISHING PR

ICING ON CAKE

* LET THERE BE SOUND!

* mokay then

* really should have gotten around to this

yep

* Chainsaws now have a suicide!
 2017-09-13 22:53:55 -05:00
CitadelStationBotandPoojawa 9a4f84da5e [MIRROR] Refactors roundstart centcom threat report. (#2739) 
* Refactors roundstart centcom threat report.

* Update blob.dm

* Update changeling.dm

* Update traitor_chan.dm

* Update sandbox.dm

* Update traitor.dm
 2017-09-13 22:50:01 -05:00
CitadelStationBotandPoojawa 0bc0d643ab [MIRROR] Fixes rack parts progress bar (#2737) 
* Fixes rack parts progress bar

* Update tables_racks.dm
 2017-09-13 22:49:23 -05:00
CitadelStationBotandPoojawa d64c23b7f9 [MIRROR] Fix syndicate toy C20r and L6 Saw not having riot darts (#2740) 
* Fix syndicate toy C20r and L6 Saw not having riot darts  (#30645)

*   Add riot darts back into toy C20r and L6 Saw

Riot darts were removed from the unrestricted variants of these guns, also changed these ruins to use the new /riot variant in order to maintain original functionality.

* Comments are good

Especially when inheritance makes everything weird.

* Fix syndicate toy C20r and L6 Saw not having riot darts
 2017-09-13 20:57:54 -05:00
CitadelStationBotandPoojawa 3b144c423c [MIRROR] Fix CentCom issues (#2619) 
* Fix CentCom issues

* Actually ports fixes
 2017-09-13 20:43:11 -05:00
CitadelStationBotandPoojawa 34edb1b5e4 [MIRROR] Fixes the Orion Trail machine (#2703) 
* Fixes the Orion Trail machine

* Update arcade.dm
 2017-09-13 18:08:18 -05:00
CitadelStationBotandPoojawa 9d52a495b2 [MIRROR] Fix monastery shuttle + Pods (#2599) 
* Fix monastery shuttle + Pods

* actually ports podfix
 2017-09-13 17:58:25 -05:00
CitadelStationBotandPoojawa 083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
CitadelStationBotandPoojawa abe52f40a6 [MIRROR] Fix transit tube atmos (again) (#2736) 
* Fix transit tube atmos (again) (#30597)

* Fix transit tube atmos

* transit tube Initialize()

* Fix transit tube atmos (again)
 2017-09-13 16:55:00 -05:00
CitadelStationBotandPoojawa 4da91bc330 [MIRROR] Fixes Archaeology not working (#2744) 
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
 2017-09-13 16:53:30 -05:00
LetterJayandGitHub 470d15fa2b Update borer_event.dm 2017-09-13 07:13:45 -05:00
LetterJayandGitHub 1471b6cac6 Merge branch 'master' into upstream-merge-30297 2017-09-13 06:41:37 -05:00
LetterJayandGitHub a960b63b0a Merge branch 'master' into upstream-merge-30056 2017-09-13 06:08:59 -05:00
LetterJay c2a41c9b51 commit 2017-09-13 06:04:22 -05:00
Kyle Spier-SwensonandCitadelStationBot 3da71799ab Garbage collection tweaks and refactors. (#30118) 
* Garbage collection queuing rewriting

* Some Tweaks

* Fixes some queue tracking oddities

* More tweaks

* Remove the middle two queue steps. tis was a silly idea

* New logging.

We store logging datums for use in tracking the stats of shit qdeleted

Added logging for destroy time as well as hard delete time, per type. As well as a few others

* Fix compile for testing

* Does the cyberboss

* does the antur
 2017-09-13 01:47:12 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJayandGitHub 4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJayandGitHub 6c5774724d Update sound.dm 2017-09-12 23:15:48 -05:00
LetterJayandGitHub f55ad5ec95 Update safe.dm 2017-09-12 23:12:19 -05:00
LetterJayandGitHub 0429a75e52 Merge pull request #2710 from Citadel-Station-13/upstream-merge-30592 
[MIRROR] Fixed changeling augmented eyesight ability
 2017-09-12 19:10:52 -05:00
LetterJayandGitHub 81fdf521fb Merge pull request #2712 from Citadel-Station-13/upstream-merge-30502 
[MIRROR] Makes shiny versions of lavaland monsters slightly more distinct
 2017-09-12 19:10:21 -05:00
kevinz000andCitadelStationBot ee5c44191d adds logging to graivpult precision throwing (#30608) 
* Update other_tools.dm

* Update other_tools.dm

* Update other_tools.dm
 2017-09-12 17:14:22 -05:00
LetterJayandGitHub eeadba6f18 Merge pull request #2696 from Citadel-Station-13/upstream-merge-30494 
[MIRROR] Adds missing span-endings
 2017-09-12 06:32:45 -05:00
LetterJayandGitHub 82db333ee3 Update tools.dm 2017-09-12 03:36:41 -05:00
LetterJayandGitHub 3ff2263a33 Update taperecorder.dm 2017-09-12 03:22:47 -05:00
LetterJayandGitHub 6413dd5264 Merge pull request #2699 from Citadel-Station-13/upstream-merge-30551 
[MIRROR] Mechs now can be connected to atmos ports
 2017-09-12 03:19:23 -05:00
LetterJayandGitHub 5c228f63a5 Update dna_injector.dm 2017-09-12 03:09:19 -05:00
LetterJayandGitHub 86a1901b5d Update AI_modules.dm 2017-09-12 03:08:53 -05:00