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

1484 Commits

Author SHA1 Message Date
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
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
deathride58
c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357 
[MIRROR] Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 20:27:54 +00:00
deathride58
0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 20:24:13 +00:00
deathride58
90b35d405a Merge pull request #4796 from Citadel-Station-13/upstream-merge-33699 
[MIRROR] Makes vault safe slightly less explosion-proof
 2018-01-13 20:22:05 +00:00
Leo
ba1f61cb9e Merge pull request #34357 from AutomaticFrenzy/patch/rpd-runtime 
Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 08:58:44 -06:00
oranges
8c1c9f5cd7 Merge pull request #34161 from ShizCalev/bot_sssembly 
Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 04:23:03 -06:00
oranges
e164b0cf25 Merge pull request #33699 from QualityVan/safedestruction 
Makes vault safe slightly less explosion-proof
 2018-01-13 04:17:27 -06:00
Leo
1d729e7d6d Merge pull request #34316 from tgstation/Cyberboss-patch-4 
Fixes poker tables not being deleted after Narsie touches them
 2018-01-12 12:30:15 -06:00
JJRcop
ed6ec3d63a Removes some hrefs from logging (#34310) 
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
 2018-01-12 07:04:39 -06:00
Leo
fc8de4df70 Merge pull request #34282 from Cyberboss/ClosetFix22 
Fix hitting closets with wrenches
 2018-01-11 17:11:37 -06:00
deathride58
e17ce47aad Merge pull request #4766 from Citadel-Station-13/upstream-merge-34164 
[MIRROR] Fixes megafauna being able to port through jaunt tunnels due to snowflake code
 2018-01-11 21:33:52 +00:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
kevinz000
6f96c169e1 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164) 
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
 2018-01-11 14:10:41 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
oranges
6dfb1e2351 Merge pull request #34206 from ShizCalev/fireaxe-drop 
Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 14:02:42 -06:00
deathride58
84cb51be0c Merge pull request #4729 from Citadel-Station-13/upstream-merge-33436 
[MIRROR] [READY]Cargo Update: Nanotrasen Supply Drop Pods!
 2018-01-11 05:16:59 +00:00
deathride58
ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58
5abe6abad6 Merge pull request #4740 from Citadel-Station-13/upstream-merge-34209 
[MIRROR] Fixes missing defib inhands
 2018-01-10 19:58:57 +00:00
deathride58
f24bf9f9fd Merge pull request #4739 from Citadel-Station-13/upstream-merge-34139 
[MIRROR] Fixes archdevils creating wall girders when trying to destroy walls.
 2018-01-10 19:58:36 +00:00
deathride58
54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111 
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
 2018-01-10 19:58:18 +00:00
deathride58
1cedccf568 Update shields.dm 2018-01-10 14:49:35 -05:00
Leo
c39de1e7ed Merge pull request #34209 from ShizCalev/defib-icon-fixes 
Fixes missing defib inhands
 2018-01-10 06:55:23 -06:00