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

8020 Commits

Author SHA1 Message Date
deathride58
2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574 
[MIRROR] Added observer verb View Gases
 2018-01-19 19:42:18 +00:00
deathride58
8d8790f4d8 Merge pull request #4950 from Citadel-Station-13/upstream-merge-34513 
[MIRROR] Move roundid and schema check to dbcore subsystem
 2018-01-19 19:41:36 +00:00
deathride58
78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557 
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
 2018-01-19 19:39:42 +00:00
deathride58
ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598 
[MIRROR] Illusions now properly use the health argument of Copy_Parent
 2018-01-19 19:39:26 +00:00
deathride58
29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569 
[MIRROR] Fixes bananium ore sprite
 2018-01-19 19:39:07 +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
b6fd362b95 Merge pull request #4942 from Citadel-Station-13/upstream-merge-34608 
[MIRROR] Fixes some dumb code in the jousting component
 2018-01-19 19:37:20 +00:00
deathride58
947b87ec0c Merge pull request #4941 from Citadel-Station-13/upstream-merge-34609 
[MIRROR] removed an extra checktick that could cause issues in shuttles
 2018-01-19 19:37:01 +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
5751c601f2 Merge pull request #4939 from Citadel-Station-13/upstream-merge-34627 
[MIRROR] Fixes pie runtime
 2018-01-19 19:36:35 +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
deathride58
ea45eb72ef Merge pull request #4937 from Citadel-Station-13/upstream-merge-34634 
[MIRROR] fix/spellcheck: Changes command error on cqc.dm
 2018-01-19 19:36:02 +00:00
deathride58
8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639 
[MIRROR] Fixes autolathe power consumption
 2018-01-19 19:35:12 +00:00
deathride58
8872f801f1 Merge pull request #4934 from Citadel-Station-13/upstream-merge-34637 
[MIRROR] Fixes empty IC syringe having 0 transfer amount
 2018-01-19 19:34:49 +00:00
deathride58
82353abaa6 Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573 
[MIRROR] Fixes the diagonal sliding
 2018-01-19 19:34:31 +00:00
deathride58
4c5e78c7f8 Merge pull request #4932 from Citadel-Station-13/upstream-merge-34576 
[MIRROR] Removes teleport beacon from Free Golem Ship
 2018-01-19 19:34:12 +00:00
deathride58
3514629c77 Merge pull request #4931 from Citadel-Station-13/upstream-merge-34331 
[MIRROR] Players can now see their own tracked playtime
 2018-01-19 19:33:50 +00:00
deathride58
e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236 
[MIRROR] Antag Panel / Check antagonists Refactor
 2018-01-19 19:33:25 +00:00
Buggy123
57c829a2aa Added observer verb View Gases (#34574) 
* Added observer verb View Gases

* Fixed atmospheric report plurality correctness

* Changed mole/s to mol.
 2018-01-19 09:23:22 -06:00
Jordan Brown
bcfbe4d14a Merge pull request #34513 from optimumtact/hostwiththemost 
Move roundid and schema check to dbcore subsystem
 2018-01-19 09:18:52 -06:00
deathride58
49a5a5cddc Fixes cancelling equipment selection being equivalent to selecting "Naked" (#34557) 
* nerfs butterfingers, throws in bonus preorder exclusive cancel button

* Update debug.dm
 2018-01-19 09:16:22 -06:00
Jordan Brown
d814497547 Merge pull request #34598 from Robustin/illusion 
Illusions now properly use the health argument of Copy_Parent
 2018-01-19 09:16:13 -06:00
Jordan Brown
7fd72d38fa Merge pull request #34569 from ShizCalev/this-shit-is-bananas 
Fixes bananium ore sprite
 2018-01-19 09:13:56 -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
1b40c727b9 Merge pull request #34608 from ninjanomnom/kevin-is-terrible 
Fixes some dumb code in the jousting component
 2018-01-19 09:04:15 -06:00
Jordan Brown
3bc7163a8f Merge pull request #34609 from ninjanomnom/leftover-checktick 
removed an extra checktick that could cause issues in shuttles
 2018-01-19 09:04:06 -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
Jordan Brown
93cc10b7a0 Merge pull request #34627 from ShizCalev/pie-runtime 
Fixes pie runtime
 2018-01-19 08:58:37 -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
ThePainkiller
90947a50ad fix/spellcheck: Changes command error on cqc.dm (#34634) 
* Update holy_weapons.dm

* Update cqc.dm
 2018-01-19 08:57:18 -06:00
Jordan Brown
363effb98f Merge pull request #34639 from DaxDupont/succ-less-power 
Fixes autolathe power consumption
 2018-01-19 08:52:49 -06:00
Jordan Brown
1639495adb Merge pull request #34637 from yorii/patch-1 
Fixes empty IC syringe having 0 transfer amount
 2018-01-19 08:52:41 -06:00
Jordan Brown
7f34b90e7c Merge pull request #34573 from AnturK/slidethis 
Fixes the diagonal sliding
 2018-01-19 08:50:28 -06:00
Jordan Brown
95b6959190 Merge pull request #34576 from coiax/removes-teleport-beacon-from-golem-ship 
Removes teleport beacon from Free Golem Ship
 2018-01-19 08:50:20 -06:00
Jordan Brown
f3627b8428 Merge pull request #34331 from Shadowlight213/expplayervisibility 
Players can now see their own tracked playtime
 2018-01-19 08:45:02 -06:00
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
AnturK
6354c6eec5 Moves creating tag before intialization (#34512) 
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
 2018-01-19 08:41:24 -06:00
LetterJay
9adbe08df8 Merge pull request #4923 from Vivinet/xeno-fix 
Temp. Xeno-Hybrid Eye Fix + Normal Leg Addition
 2018-01-19 03:21:14 -06:00
LetterJay
caa0d29bc8 Merge pull request #4926 from Citadel-Station-13/upstream-merge-34213 
[MIRROR] [ready] Adds a system to get a stack trace as a list.
 2018-01-19 02:52:29 -06:00
LetterJay
379fdb613e Merge pull request #4925 from Citadel-Station-13/upstream-merge-34492 
[MIRROR] Ports Aurora's floor tile color turf decals (For mappers)
 2018-01-19 02:52:21 -06:00
LetterJay
cd178d9756 Merge pull request #4921 from Citadel-Station-13/upstream-merge-34472 
[MIRROR] Fixes irreparable plating, deprecates broken & burnt vars on maps
 2018-01-19 02:51:51 -06:00
LetterJay
6981bcfab2 Merge pull request #4909 from Citadel-Station-13/upstream-merge-34541 
[MIRROR] Adds a Recipe for morphine to medicine
 2018-01-19 02:49:12 -06:00
Jordan Brown
9478478ca1 Merge pull request #34213 from MrStonedOne/gibstacktrace 
[ready] Adds a system to get a stack trace as a list.
 2018-01-18 22:45:39 -06: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
Vivinet
18fa25cc17 Temp. Xeno Eye Fix - Leg Addition 
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
 2018-01-18 18:20:58 -08:00
ShizCalev
f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58
c545dc2f79 Merge pull request #4919 from Citadel-Station-13/upstream-merge-34563 
[MIRROR] Regens icons on clean_act if item is loc'd on a mob
 2018-01-19 00:33:07 +00: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
deathride58
61ccb255c4 Merge pull request #4915 from Citadel-Station-13/upstream-merge-34438 
[MIRROR] Mass hallucinations now gives the same hallucination to everyone
 2018-01-19 00:32:11 +00:00