shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,843 Commits 5 Branches 0 Tags
071235d790bdfede1a2dfaa3086fe9cd8dce9be1
Commit Graph

3019 Commits

Author SHA1 Message Date
deathride58
87b614aaf9 Merge pull request #4817 from Citadel-Station-13/upstream-merge-34338 
[MIRROR] Replaces cached get_area vars to grab area names with get_area_name()
 2018-01-14 04:01:33 +00:00
ShizCalev
80095fea0a Replaces cached get_area vars for names (#34338) 2018-01-13 20:56:11 -06:00
AnturK
269cbab223 Fixes cables/lattices for lateloaded templates. 2018-01-13 14:51:03 -06:00
deathride58
6b5f8b0cad Merge pull request #4810 from Citadel-Station-13/upstream-merge-34347 
[MIRROR] Fix the Ark's z-level checks
 2018-01-13 20:28:43 +00: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
deathride58
80c4d1d92e Merge pull request #4793 from Citadel-Station-13/upstream-merge-34313 
[MIRROR] Fix airlock console HTML
 2018-01-13 20:21:03 +00:00
Leo
96679b1c0d Merge pull request #34347 from AutomaticFrenzy/patch/ark-z 
Fix the Ark's z-level checks
 2018-01-13 09:01:09 -06: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
9c17444c5f Merge pull request #34313 from AutomaticFrenzy/patch/airlock-controller 
Fix airlock console HTML
 2018-01-12 12:57:52 -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
deathride58
62cfb99cb7 Merge pull request #4788 from Citadel-Station-13/upstream-merge-34310 
[MIRROR] Removes some hrefs from logging
 2018-01-12 17:48:13 +00:00
deathride58
f90a0e66e0 Merge pull request #4784 from Citadel-Station-13/upstream-merge-34174 
[MIRROR] Sigils of submission now uncuff upon successful conversion
 2018-01-12 17:46:46 +00:00
deathride58
63354404e4 Merge pull request #4782 from Citadel-Station-13/upstream-merge-34260 
[MIRROR] Adds an indestructible disco/dance machine for admemes and disco inferno shuttle
 2018-01-12 17:46:00 +00:00
deathride58
30bec7a1d0 Merge pull request #4775 from Citadel-Station-13/upstream-merge-34295 
[MIRROR] Fixes brass skewer grammar
 2018-01-12 17:42:56 +00:00
deathride58
8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297 
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
 2018-01-12 17:42:39 +00:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090 
[MIRROR] Replace hardcoded z-level numbers with a trait system
 2018-01-12 17:41:28 +00: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
MoreRobustThanYou
de695abb26 Sigils of submission now uncuff upon successful conversion (#34174) 
* Sigils of submission now uncuff upon successful conversion

No more retards forgetting to uncuff after conversion

* Update clock_sigils.dm
 2018-01-11 21:51:30 -06:00
Dax Dupont
af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260) 
* Dance machine fix

* I have no ass and i must blast
 2018-01-11 21:36:56 -06:00
Jordan Brown
08da9ea5a0 Fixes brass skewer grammar 2018-01-11 21:26:43 -06:00
kevinz000
08339940c1 Update ark_of_the_clockwork_justicar.dm (#34297) 2018-01-11 21:24:31 -06:00
deathride58
eedf8eb101 Update cit_objectives.dm 2018-01-11 20:19:09 -05:00
deathride58
15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05: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
LetterJay
d04260eab2 Merge pull request #4761 from Citadel-Station-13/upstream-merge-34206 
[MIRROR] Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 15:18:55 -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
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -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
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -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
400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096 
[MIRROR] Cult will actually report victories now
 2018-01-10 19:57:56 +00:00
deathride58
df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160 
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 19:57:35 +00:00
deathride58
f00252540b Merge pull request #4732 from Citadel-Station-13/upstream-merge-34185 
[MIRROR] Fixes feedback spell level var
 2018-01-10 19:56:30 +00:00
deathride58
2ee5252a62 Merge pull request #4730 from Citadel-Station-13/upstream-merge-34170 
[MIRROR] Fixes non-holy mobs purifying BBS
 2018-01-10 19:55:35 +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
Goodstuff
bc543c5220 Update twohanded.dm (#34139) 2018-01-10 03:51:23 -06:00
ShizCalev
594de23c1f Fixes buckled message spam for ghosts inside talking scythes (#34111) 
* Fixes buckled message spam for ghosts

* params
 2018-01-10 03:48:10 -06:00
Robustin
1bd84a8f6b Cult will actually report victories now (#34096) 
* Cult victory fix

* Update cult.dm

* Correct cult victory report
 2018-01-10 03:46:55 -06:00