shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,387 Commits 5 Branches 0 Tags
83b0a656eab4eec5378cb0b6c700d05ea0ff9a1f
Commit Graph
3302 Commits
Author SHA1 Message Date
deathride58andGitHub 8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639 
[MIRROR] Fixes autolathe power consumption
 2018-01-19 19:35:12 +00:00
deathride58andGitHub 82353abaa6 Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573 
[MIRROR] Fixes the diagonal sliding
 2018-01-19 19:34:31 +00:00
deathride58andGitHub e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236 
[MIRROR] Antag Panel / Check antagonists Refactor
 2018-01-19 19:33:25 +00:00
Jordan BrownandCitadelStationBot 7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction 
Corrects tile color defines
 2018-01-19 12:24:00 -06:00
Ashe HiggsandCitadelStationBot c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504) 
* lets you cancel cc warps

* runtimestation
 2018-01-19 09:57:57 -06:00
kevinz000andCitadelStationBot b7df40727d You can now buckle people to target stakes (#34514) 
* Update target_stake.dm

* Update target_stake.dm

* Update target_stake.dm
 2018-01-19 09:52:42 -06:00
Jordan BrownandCitadelStationBot 5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest 
fixes supply drop pods being impossible to dissassemble
 2018-01-19 09:43:21 -06:00
Jordan BrownandCitadelStationBot bcfbe4d14a Merge pull request #34513 from optimumtact/hostwiththemost 
Move roundid and schema check to dbcore subsystem
 2018-01-19 09:18:52 -06:00
Jordan BrownandCitadelStationBot 3cb5b20709 Merge pull request #34601 from KorPhaeron/bomb 
TTVs are too big to fit in bags
 2018-01-19 09:12:45 -06:00
Jordan BrownandCitadelStationBot 495bbb0101 Merge pull request #34626 from ShizCalev/borg-recharge-runtime 
Fixes borg cell recharging runtime
 2018-01-19 09:00:50 -06:00
Trevor SerpasandCitadelStationBot 5d2ddd833a Reduce the volume of the death sound on clock work mobs (#34452) 
* Reduce the volume of the death sound on clock work mobs

I edited the .oog since I did not see a way in the code to lower the volume. This will affect all code/game/gamemodes/clock_cult/clock_mobs which at this moment is only maraders and the eminence.

* Non-clockwork mobs are no longer affected

adjusted volume in the code so that the clockwork golems, ratvar, and ratvar plushies are unaffected by the audio file changes
 2018-01-19 08:58:29 -06:00
Jordan BrownandCitadelStationBot 363effb98f Merge pull request #34639 from DaxDupont/succ-less-power 
Fixes autolathe power consumption
 2018-01-19 08:52:49 -06:00
Jordan BrownandCitadelStationBot 7f34b90e7c Merge pull request #34573 from AnturK/slidethis 
Fixes the diagonal sliding
 2018-01-19 08:50:28 -06:00
AnturKandCitadelStationBot 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
AnturKandCitadelStationBot 6354c6eec5 Moves creating tag before intialization (#34512) 
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
 2018-01-19 08:41:24 -06:00
deathride58andGitHub 19fa1066d9 Update AI_modules.dm 2018-01-19 08:48:40 -05:00
LetterJayandGitHub 379fdb613e Merge pull request #4925 from Citadel-Station-13/upstream-merge-34492 
[MIRROR] Ports Aurora's floor tile color turf decals (For mappers)
 2018-01-19 02:52:21 -06:00
deathride58andCitadelStationBot 757dfbbdc5 Ports Aurora's floor tile color turf decals (For mappers) (#34492) 
* ports Aurora's floor tile color decals

* replaces aurora's decals with new ones that actually have detail, renames turf_decal/corner to turf_decal/tile

* corner > tile decal
 2018-01-18 21:28:14 -06:00
ShizCalevandCitadelStationBot f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
LeoandCitadelStationBot a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
deathride58andGitHub d54dae8ddf Merge pull request #4918 from Citadel-Station-13/upstream-merge-34552 
[MIRROR] All crew can purify the Blood Bastard Sword (again)
 2018-01-19 00:32:50 +00:00
deathride58andGitHub ca9ce2058e Merge pull request #4917 from Citadel-Station-13/upstream-merge-34529 
[MIRROR] changes the null rod's description to reflect its use against clockwork cults
 2018-01-19 00:32:26 +00:00
deathride58andGitHub 553ccd5597 Merge pull request #4911 from Citadel-Station-13/upstream-merge-34558 
[MIRROR] Log PDA messages sent by the message monitor console
 2018-01-18 23:06:19 +00:00
Jordan BrownandCitadelStationBot 66bc684184 Merge pull request #34552 from Robustin/revert3 
All crew can purify the Blood Bastard Sword (again)
 2018-01-18 16:59:39 -06:00
Jordan BrownandCitadelStationBot a38dc60466 Merge pull request #34529 from Xhuis/nullroddesc 
changes the null rod's description to reflect its use against clockwork cults
 2018-01-18 16:56:26 -06:00
Jordan BrownandCitadelStationBot 08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
ThePainkillerandCitadelStationBot f2c5a8ae2a Spellcheck: Fixed a typo on holy_weapons.dm (#34561) 2018-01-18 16:46:13 -06:00
LetterJayandGitHub 91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
LeoandCitadelStationBot 0d6d7116ff Merge pull request #34533 from Buggy123/patch-56 
Fixes integrity value for non-reinforced plasma window
 2018-01-18 06:11:01 -06:00
deathride58 9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58andGitHub 45818d03b3 Merge pull request #4901 from Citadel-Station-13/upstream-merge-33916 
[MIRROR] [READY] Allows the supermatter's radiation collectors to produce research points in short bursts
 2018-01-17 20:15:38 +00:00
deathride58andGitHub e8e6b3e770 Merge pull request #4899 from Citadel-Station-13/upstream-merge-34500 
[MIRROR] fixes a mass recall runtime error that prevented it from working
 2018-01-17 20:14:55 +00:00
deathride58andGitHub e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319 
[MIRROR] Fails travis on common mapping mistakes
 2018-01-17 20:12:39 +00:00
deathride58andGitHub a0319643bd Merge pull request #4887 from Citadel-Station-13/upstream-merge-34378 
[MIRROR] Pirates are now skeletons
 2018-01-17 20:11:12 +00:00
deathride58andGitHub 7b4214b199 Merge pull request #4886 from Citadel-Station-13/upstream-merge-34427 
[MIRROR] Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow
 2018-01-17 20:10:45 +00:00
deathride58andCitadelStationBot a0a3232360 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916) 
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
 2018-01-17 11:18:21 -06:00
LetterJayandGitHub bf7a6e4340 Merge pull request #4885 from Citadel-Station-13/upstream-merge-34464 
[MIRROR] Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-17 10:06:17 -06:00
LetterJayandGitHub 59e5a71e78 Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468 
[MIRROR] Cleans up some redundant stripped_input usage
 2018-01-17 09:45:04 -06:00
LetterJayandGitHub 6bcf918111 Update message.dm 2018-01-17 09:40:34 -06:00
LetterJayandGitHub ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
LetterJayandGitHub aaee67bee5 Merge pull request #4858 from Citadel-Station-13/upstream-merge-34449 
[MIRROR] Fixes recycler/anything with mat container emagging.
 2018-01-17 09:39:05 -06:00
LetterJayandGitHub 8a04f19e0a Merge pull request #4877 from Citadel-Station-13/upstream-merge-34470 
[MIRROR] Moves load_motd to config controller
 2018-01-17 09:36:43 -06:00
LetterJayandGitHub a05b64c7e7 Merge pull request #4876 from Citadel-Station-13/upstream-merge-34429 
[MIRROR] Fix RPD embedding fixtures inside lattices and girders
 2018-01-17 09:36:33 -06:00
Jordan BrownandCitadelStationBot b6150e8525 Merge pull request #34500 from Xhuis/recallfix 
fixes a mass recall runtime error that prevented it from working
 2018-01-17 07:10:30 -06:00
LetterJayandGitHub 127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
orangesandCitadelStationBot c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
orangesandCitadelStationBot 3a3ff21fbf Merge pull request #34378 from nicbn/yarr 
Pirates are now skeletons
 2018-01-16 14:34:59 -06:00
Ashe HiggsandCitadelStationBot 33de2bd2f9 Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow (#34427) 
* Portal tweaks, and blocked atmos

* Update servant_blocker.dm

* Update servant_blocker.dm

* Update servant_blocker.dm
 2018-01-16 14:33:46 -06:00
orangesandCitadelStationBot 25fc0d0161 Merge pull request #34464 from uraniummeltdown/dumbcult 
Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-16 14:32:33 -06:00
orangesandCitadelStationBot ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00