shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,314 Commits 5 Branches 0 Tags
886459dcc34f0fded48d80ebfc626ca1785456eb
Commit Graph

1506 Commits

Author SHA1 Message Date
deathride58
10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603 
[MIRROR] Revert "Fix config_dir usage (#34469)"
 2018-01-19 19:52:36 +00:00
deathride58
9eada1167b Merge pull request #4965 from Citadel-Station-13/upstream-merge-34620 
[MIRROR] Corrects tile color defines
 2018-01-19 19:46:56 +00:00
deathride58
1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514 
[MIRROR] You can now buckle people to target stakes
 2018-01-19 19:44:39 +00:00
deathride58
2906e24f56 Merge pull request #4961 from Citadel-Station-13/upstream-merge-34551 
[MIRROR] fixes supply drop pods being impossible to dissassemble
 2018-01-19 19:44:18 +00:00
deathride58
c12422564f Merge pull request #4944 from Citadel-Station-13/upstream-merge-34601 
[MIRROR] TTVs are too big to fit in bags
 2018-01-19 19:38:54 +00:00
deathride58
98cc937b40 Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626 
[MIRROR] Fixes borg cell recharging runtime
 2018-01-19 19:36:47 +00:00
deathride58
ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452 
[MIRROR] Reduce the volume of the death sound on clock work mobs
 2018-01-19 19:36:18 +00:00
Jordan Brown
7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction 
Corrects tile color defines
 2018-01-19 12:24:00 -06:00
kevinz000
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 Brown
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 Brown
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 Brown
495bbb0101 Merge pull request #34626 from ShizCalev/borg-recharge-runtime 
Fixes borg cell recharging runtime
 2018-01-19 09:00:50 -06:00
Trevor Serpas
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
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
deathride58
19fa1066d9 Update AI_modules.dm 2018-01-19 08:48:40 -05:00
deathride58
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
Leo
a0f815c5c4 Revert "Fix config_dir usage (#34469)" 2018-01-18 19:38:40 -06:00
deathride58
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
deathride58
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
Jordan Brown
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 Brown
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
ThePainkiller
f2c5a8ae2a Spellcheck: Fixed a typo on holy_weapons.dm (#34561) 2018-01-18 16:46:13 -06:00
Leo
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
deathride58
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
deathride58
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
deathride58
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
LetterJay
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
LetterJay
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
LetterJay
ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
LetterJay
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
LetterJay
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
LetterJay
127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
oranges
3a3ff21fbf Merge pull request #34378 from nicbn/yarr 
Pirates are now skeletons
 2018-01-16 14:34:59 -06:00
oranges
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
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
oranges
1f7e25be0a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-16 14:28:17 -06:00
oranges
9ff1be35cc Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-16 14:26:53 -06:00
LetterJay
7d7042fc60 Merge pull request #4871 from Citadel-Station-13/upstream-merge-34475 
[MIRROR] Makes tanks made of metal
 2018-01-16 13:49:18 -06:00
Jordan Brown
6977eb6ce2 Merge pull request #34475 from ShizCalev/internals-metal 
Makes tanks made of metal
 2018-01-16 08:34:13 -06:00
AnturK
89766bdc4e Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 07:33:41 -06:00
LetterJay
3c281161b8 Merge pull request #4853 from Citadel-Station-13/upstream-merge-34385 
[MIRROR] Greyscale wirecutters
 2018-01-16 03:53:36 -06:00
kevinz000
2df3695048 Fixes recycler/anything with mat container emagging. 2018-01-16 03:51:50 -06:00
MoreRobustThanYou
053fe00021 Greyscale wirecutters (#34385) 
* Greyscale Wirecutters!

* WOOPS!

* Hopefully make the colors lighter.

* hexcodes

* Fixy fixy

* Add files via upload
 2018-01-15 15:16:47 -06:00
Ashe Higgs
9a5b1da92c Adds the Lightbulb bar sign (#34480) 2018-01-15 15:06:28 -06:00
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
deathride58
14ae9ace64 Merge pull request #4831 from Citadel-Station-13/upstream-merge-34374 
[MIRROR] Rocket Pods now require manual disassembly
 2018-01-15 06:18:29 +00:00
John Ginnane
ac1b2f76ef Fixed alt-click not working with stacks (#34396) 
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
 2018-01-14 22:05:07 -06:00
Iamgoofball
a5a1838bcb Rocket Pods now require manual disassembly (#34374) 
Bluespacing out simply wasn't metal enough tbh
 2018-01-14 21:59:20 -06:00