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

3190 Commits

Author SHA1 Message Date
LetterJay
50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay
1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -06:00
LetterJay
c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848 
[MIRROR] Adds new landmark icons
 2018-01-24 21:42:12 -06:00
LetterJay
b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -06:00
LetterJay
793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
LetterJay
dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807 
[MIRROR] Fixes the kitchen spike turning people upside down forever
 2018-01-24 20:46:16 -06:00
LetterJay
f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -06:00
LetterJay
d573e67ff6 Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487 
[MIRROR] Costumes for nuclear operatives
 2018-01-24 20:44:43 -06:00
LetterJay
cbaca56dbf Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458 
[MIRROR] Refactors and nerfs Fleshmend
 2018-01-24 20:44:30 -06:00
LetterJay
ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -06:00
MoreRobustThanYou
35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
Jordan Brown
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -06:00
ShizCalev
6ed56158e3 Adds new landmark icons (#34848) 
* Adds new landmark icons

* Update

* Blue
 2018-01-24 18:08:33 -06:00
LetterJay
072056f919 Update fleshmend.dm 2018-01-24 15:40:05 -06:00
oranges
8b2da0aa90 Merge pull request #34746 from DaxDupont/autolathe 
Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 14:14:37 -06:00
ExcessiveUseOfCobblestone
eb1a6b89ef One can no longer use cogscarab as a form of Eminence priority. (#34611) 
Cogscarabs are meant to build, and wasting an integral (building) slot for something you can get as a ghost so you get priority is shitty to both other ghosts and team (the second one being an admin issue).

If you want to go eminence, you can roll for it as a ghost like everyone else.
 2018-01-24 14:03:08 -06:00
coiax
481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
LetterJay
85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
Ashe Higgs
be9f8a2d06 Refactors and nerfs Fleshmend 2018-01-24 13:56:20 -06:00
LetterJay
b898e53be0 Merge pull request #5065 from Citadel-Station-13/upstream-merge-34775 
[MIRROR] Removed named args from visible_message
 2018-01-24 13:54:34 -06:00
Robustin
f8c349ea54 Gives clockwork marauders a reasonable cost/cooldown (#34285) 
balance: Clockwork marauders now take more time (+3s) and power (7x) to create.
balance: The "recent marauder" time limit is now 60 seconds, up from 20. The limit now has a significantly smaller effect on summon time but will act as a further cap on marauder summoning until it has passed.
tweak: The marauder cap will now only account for living cultists.
 2018-01-24 13:53:03 -06:00
LetterJay
ee253a6c54 Merge pull request #5055 from Citadel-Station-13/upstream-merge-34808 
[MIRROR] Abstract landmarks are now indestructible
 2018-01-24 13:52:41 -06:00
LetterJay
8315716380 Merge pull request #5053 from Citadel-Station-13/upstream-merge-34766 
[MIRROR] Xeno nests are no longer held together by bolts.
 2018-01-24 13:51:48 -06:00
KorPhaeron
7267f4a5f3 Fixes the kitchen spike turning people upside down forever (#34807) 2018-01-24 13:02:39 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message 
Removed named args from visible_message
 2018-01-24 11:59:50 -06:00
coiax
d7c317b6d0 Abstract landmarks are now indestructible (#34808) 
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.

There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
 2018-01-24 06:12:57 -06:00
kevinz000
f903330b0e Xeno nests are no longer held together by bolts. (#34766) 
* Update bed.dm

* Update alien_nest.dm
 2018-01-24 06:12:37 -06:00
Jordan Brown
070a4bc0c4 Merge pull request #34817 from ninjanomnom/stop-pointing-at-me 
Makes the point effect not trigger movement code
 2018-01-24 06:12:29 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522 
[MIRROR] Adds ~70 more suicides
 2018-01-23 10:00:04 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560 
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
 2018-01-23 09:59:41 -06:00
LetterJay
ab002f56be Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778 
[MIRROR] Fixes invalid pollCandidatesForMob args
 2018-01-23 08:24:31 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476 
[MIRROR] Simple rotation component.
 2018-01-23 08:24:19 -06:00
LetterJay
acb333d403 Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765 
[MIRROR] Fixes APC controller runtime
 2018-01-23 08:22:56 -06:00
LetterJay
a7270f43cd Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750 
[MIRROR] current sanity check in ark of the justicar
 2018-01-23 08:21:10 -06:00
LetterJay
9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142 
[MIRROR] Refactors infrared beams to update faster
 2018-01-23 08:18:38 -06:00
LetterJay
ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810 
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
 2018-01-23 08:18:21 -06:00
LetterJay
8ad54530a1 Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759 
[MIRROR] Consolidated t-ray scanner code
 2018-01-23 08:16:52 -06:00
Leo
326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob 
Fixes invalid pollCandidatesForMob args
 2018-01-23 06:42:08 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476) 
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
 2018-01-23 02:09:16 -06:00
oranges
4dac26d2da Merge pull request #34765 from ShizCalev/apc-controller-runtime 
Fixes APC controller runtime
 2018-01-23 01:42:43 -06:00
oranges
07b94d7bd9 Merge pull request #34750 from ShizCalev/clockwork-current- 
current sanity check in ark of the justicar
 2018-01-23 01:42:36 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
kevinz000
ffaf6e2ba0 Infrared Refactor (#34142) 
bugfix: Infrared beams now update instantly.
 2018-01-23 01:32:28 -06:00
oranges
630d823d1a Merge pull request #34810 from tgstation/KorPhaeron-patch-2 
[s]Fixes being able to lower w_class of transfer valves
 2018-01-23 01:12:54 -06:00
Cruix
23e5b7f396 Consolidated t-ray scanner code (#34759) 
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
 2018-01-22 15:45:07 -06:00
AnturK
1a85c90fab Adds transform helpers to atom vv (#34756) 2018-01-22 15:42:53 -06:00
Iamgoofball
e862c1138e >people think burn victims are better than literally-cant-see-shit (#34734) 2018-01-22 13:06:32 -06:00
deathride58
5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 
[MIRROR] Longer lasting candles.
 2018-01-22 06:24:35 +00:00