shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,884 Commits 5 Branches 0 Tags
d6e7dcdf3703c47b09dd49ce2811eff94856bbce
Commit Graph

5508 Commits

Author SHA1 Message Date
Poojawa
d6e7dcdf37 Merge branch 'master' into digileg-runtime 2018-03-17 20:16:21 -05:00
Poojawa
27ec18988a wew 2018-03-17 20:14:15 -05:00
Poojawa
d3407f1711 a few other little runtimes 2018-03-17 20:03:21 -05:00
Poojawa
c8365e6be7 Hunts down some runtimes 
cleans up some dogborg sleeper code too
 2018-03-17 19:38:03 -05:00
deathride58
02c3f6d0a0 Merge pull request #5985 from Citadel-Station-13/upstream-merge-36399 
[MIRROR] Fixes the tesla coil research screwdrivering
 2018-03-18 00:18:55 +00:00
deathride58
082d36fa6b Merge pull request #5964 from Citadel-Station-13/upstream-merge-36459 
[MIRROR] Clown Ops
 2018-03-17 23:58:15 +00:00
deathride58
087255b1f1 Merge pull request #5904 from Poojawa/sprite-tweaks 
Ckey locks on Sprite_accessories!
 2018-03-17 23:57:16 +00:00
deathride58
f74aa475c1 Merge pull request #5988 from Citadel-Station-13/upstream-merge-36449 
[MIRROR] Chem dispenser upgrade
 2018-03-17 23:55:32 +00:00
deathride58
79db79f630 Merge pull request #5987 from Citadel-Station-13/upstream-merge-36437 
[MIRROR] Tesla coils and grounding rods actually shock buckled mobs.
 2018-03-17 23:54:50 +00:00
deathride58
a9f8c70d62 Merge pull request #5986 from Citadel-Station-13/upstream-merge-36364 
[MIRROR] Changes stormtrooper ammo to 10g slugs
 2018-03-17 23:54:33 +00:00
deathride58
d2926f3ba9 Merge pull request #5984 from Citadel-Station-13/upstream-merge-36470 
[MIRROR] Fixes admins not working in certain cases
 2018-03-17 23:54:16 +00:00
deathride58
df8fe921cc Merge pull request #5983 from Citadel-Station-13/upstream-merge-36478 
[MIRROR] Gibs admin observers follow links
 2018-03-17 23:53:57 +00:00
deathride58
50a05952d2 Merge pull request #5982 from Citadel-Station-13/upstream-merge-36475 
[MIRROR] Fixed diseases getting negative points
 2018-03-17 23:53:32 +00:00
deathride58
d30be811be Merge pull request #5979 from Citadel-Station-13/upstream-merge-36410 
[MIRROR] Fixes dupe and runtime issues with Rod of Asclepius
 2018-03-17 23:52:52 +00:00
deathride58
8b2aa30d6f Merge pull request #5977 from Citadel-Station-13/upstream-merge-36443 
[MIRROR] Makes vanilla ice cream... require vanilla!
 2018-03-17 23:51:37 +00:00
deathride58
238c8b24e2 Merge pull request #5974 from Citadel-Station-13/upstream-merge-36425 
[MIRROR] Sec officers always like donuts
 2018-03-17 23:50:30 +00:00
deathride58
b8d6bc53cf Merge pull request #5973 from Citadel-Station-13/upstream-merge-36432 
[MIRROR] Fixes brain damage json runtime
 2018-03-17 23:50:10 +00:00
deathride58
f5e49123e0 Merge pull request #5971 from Citadel-Station-13/upstream-merge-36409 
[MIRROR] Fixed cameras holding up the arrival shuttle
 2018-03-17 23:49:23 +00:00
deathride58
1fc5fe361c Merge pull request #5970 from Citadel-Station-13/upstream-merge-36393 
[MIRROR] Fixes bluespace radio potions
 2018-03-17 23:49:02 +00:00
deathride58
b9a73ded87 Update coil.dm 2018-03-17 19:48:42 -04:00
deathride58
b0f4508392 Merge pull request #5967 from Citadel-Station-13/upstream-merge-36130 
[MIRROR] [READY] Refactors wet floors to a component
 2018-03-17 23:47:15 +00:00
vuonojenmustaturska
aceed22b76 Chem dispenser upgrade 2018-03-17 10:10:20 -05:00
RandomMarine
c1e897b298 Tesla coils and grounding rods actually shock buckled mobs. (#36437) 
* coils and grounding rods shock buckled things

* general tesla buckle shock proc
 2018-03-17 08:49:38 -05:00
81Denton
f82456fd7f Changes stormtrooper ammo to 10g slugs (#36364) 
* pulse slug instead of buckshot

* 10 gauge baby

* 10g name
 2018-03-17 08:47:24 -05:00
vuonojenmustaturska
a4e10653c7 Fixes the tesla coil research screwdrivering 2018-03-17 08:30:54 -05:00
Kyle Spier-Swenson
67d7cf3477 Fixes admins not working in certain cases (#36470) 
* Fixes admins not working in certain cases

>admin doesn't get rank because of casing issue.

* put this in the wrong place
 2018-03-17 08:26:37 -05:00
vuonojenmustaturska
aea919e4ec Merge pull request #36478 from MrStonedOne/patch-495 
Gibs admin observers follow links
 2018-03-17 08:25:25 -05:00
vuonojenmustaturska
f0cb5fd3d8 Merge pull request #36475 from Cruix/disease_fix 
Fixed diseases getting negative points
 2018-03-17 08:25:17 -05:00
TheDreamweaver
49a772b6b7 Fixes dupe and runtime issues with Rod of Asclepius (#36410) 
* Fixes bug with duplicating rod on removal while lying down, as well as implemented a new force_put_in_hand() proc, and cleaned up some code.

* Merged force_put_in_hand() with put_in_hand() and cleaned up code.
 2018-03-17 08:22:38 -05:00
vuonojenmustaturska
2d8258057b Merge pull request #36443 from ShizCalev/vanilla-icecream 
Makes vanilla ice cream... require vanilla!
 2018-03-17 08:21:17 -05:00
vuonojenmustaturska
75088e9b36 Merge pull request #36425 from Shadowlight213/donutsec 
Sec officers always like donuts
 2018-03-17 07:54:12 -05:00
oranges
9ea4bd45c2 Merge pull request #36432 from ShizCalev/braindamageeventruntime 
Fixes brain damage json runtime
 2018-03-17 07:54:04 -05:00
oranges
11d1119d6f Merge pull request #36409 from Cruix/disease_shuttle 
Fixed cameras holding up the arrival shuttle
 2018-03-17 07:53:44 -05:00
oranges
e4c2aae759 Merge pull request #36393 from Polyphynx/slimeradio 
Fixes bluespace radio potions
 2018-03-17 07:53:37 -05:00
kevinz000
f78fea7333 [READY] Refactors wet floors to a component (#36130) 
* Wet Floor components

* No more turf wet slide.
 2018-03-17 07:53:11 -05:00
AnturK
80e046572f Allows traitor AI's to take direct control of turrets. (#36154) 
* Allows traitor AI's to take direct control of turrets.

* Adds some icons
 2018-03-17 07:53:01 -05:00
Cruix
b4457dfefd Clown Ops 2018-03-17 07:52:41 -05:00
CitadelStationBot
13709a7d34 [MIRROR] Simple xeno antagonist (#5961) 
* Simple xeno antagonist

* Merge pull request #36397 from AnturK/xeno_antag

Simple xeno antagonist
 2018-03-17 05:23:21 -05:00
deathride58
063abf2a5d Makes xenobio consoles upgradeable via disks obtainable from bluespace research, makes most xenobio console abilities exclusive to disk upgrades (#5953) 
* Makes xenobiology consoles rely on upgrades, spreads out xenobio console abilities into upgrade disks

* Update xenobio_camera.dm
 2018-03-16 10:13:06 -07:00
deathride58
8923bb9488 Small combat balancing: Small crawling nerf, Esword buff (#5937) 
* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
 2018-03-16 03:27:30 -07:00
CitadelStationBot
0bf1f7ce14 [MIRROR] Refactors some trauma code, fixes some trauma heals not working (#5955) 
* Refactors some trauma code, fixes some trauma heals not working (#36093)

* Refactors some trauma code, fixes some trauma heals not working

* that too

* fix indent

* antur comments

* Refactors some trauma code, fixes some trauma heals not working
 2018-03-15 20:50:10 -05:00
Poojawa
31d988344a maybe actually have mentors that aren't broke as shit (#5954) 2018-03-15 20:49:32 -05:00
CitadelStationBot
89f37cc8b7 [MIRROR] Fixes broken bot icons (#5952) 
* Merge pull request #36379 from ShizCalev/bot-icon-fixes

Fixes broken bot icons

* Fixes broken bot icons
 2018-03-15 07:20:24 -05:00
Poojawa
6784c4e6a7 Update carbon_defense.dm 
I don't even know if this fixes anything but w/e
 2018-03-14 18:53:57 -05:00
Poojawa
452b58d1a1 makes traits more paranoid, also removes the double application (#5929) 2018-03-14 17:28:42 -05:00
CitadelStationBot
f00246ae79 [MIRROR] The names of Surgery Disks now match their type of surgery (#5950) 
* The names of Surgery Disks now match their type of surgery

* Merge pull request #36407 from SailorDave/surgery-disk-names

The names of Surgery Disks now match their type of surgery
 2018-03-14 16:58:36 -05:00
Poojawa
6c7da493d9 Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951) 
* maps and tgui

* missed defines and helpsers

* controller things

* datums

* game folder stuff

* module things

* icons

* stragglers

* map sync and updating

wew lad
 2018-03-14 16:49:40 -05:00
CitadelStationBot
dff9dabf06 [MIRROR] Fixes stopsounds properly (#5931) 
* Fixes stopsounds properly (#36341)

* Revert "Merge pull request #36340 from vuonojenmustaturska/beelogreen"

This reverts commit 259838f38cfda32619e34cf41d57df4d45b75363, reversing
changes made to 111cd316a92f5f5840d96b1fc4bbe4cb7b1ce6fd.

* Fixes stopsounds properly

Also I forgot to actually block admins from bad protocols
it just showed them a message that it was blocked but didn't
block it

* Fixes stopsounds properly
 2018-03-13 05:46:27 -05:00
CitadelStationBot
8dc9fcf816 [MIRROR] Fixes blindfolds blinding when not over your eyes (#5936) 
* Fixes blindfolds blinding when not over your eyes (#36316)

* fixes blindfolds

* lets use ref instead then

* Fixes blindfolds blinding when not over your eyes
 2018-03-13 05:45:53 -05:00
CitadelStationBot
31ffc89cbc [MIRROR] Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#5920) 
* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights. (#35987)

* Aurora caelus

* I saw that!

* fix?

* Weight increase for testmerge

* Update aurora_caelus.dm

* Adds the Aurora Caelus event, the deep-space equivalent of the northern lights.
 2018-03-12 13:13:00 -05:00