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

8044 Commits

Author SHA1 Message Date
LetterJay
097f2b2ddf Update life.dm 2018-01-20 13:18:25 -06:00
XDTM
b13be9240c Fixes slimes not attacking anybody 2018-01-19 19:29:52 -06:00
deathride58
10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603 
[MIRROR] Revert "Fix config_dir usage (#34469)"
 2018-01-19 19:52:36 +00:00
deathride58
9eada1167b Merge pull request #4965 from Citadel-Station-13/upstream-merge-34620 
[MIRROR] Corrects tile color defines
 2018-01-19 19:46:56 +00:00
deathride58
f6dbe3ea58 Merge pull request #4963 from Citadel-Station-13/upstream-merge-34504 
[MIRROR] allows servants to cancel warps more intuitively by clicking on the button again
 2018-01-19 19:45:23 +00:00
deathride58
1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514 
[MIRROR] You can now buckle people to target stakes
 2018-01-19 19:44:39 +00:00
deathride58
2906e24f56 Merge pull request #4961 from Citadel-Station-13/upstream-merge-34551 
[MIRROR] fixes supply drop pods being impossible to dissassemble
 2018-01-19 19:44:18 +00:00
deathride58
28147de16a Merge pull request #4960 from Citadel-Station-13/upstream-merge-34501 
[MIRROR] Allow mapping non-default scrubbers
 2018-01-19 19:44:00 +00:00
deathride58
4077ec6713 Merge pull request #4957 from Citadel-Station-13/upstream-merge-34641 
[MIRROR] Fixes conveyor belt power usage.
 2018-01-19 19:43:33 +00:00
deathride58
26bca66519 Merge pull request #4956 from Citadel-Station-13/upstream-merge-34547 
[MIRROR] Jaunt Direction Fix
 2018-01-19 19:43:14 +00:00
deathride58
86ca34d806 Merge pull request #4953 from Citadel-Station-13/upstream-merge-34616 
[MIRROR] Adds byond versions to feedback
 2018-01-19 19:42:36 +00:00
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
Jordan Brown
7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction 
Corrects tile color defines
 2018-01-19 12:24:00 -06:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504) 
* lets you cancel cc warps

* runtimestation
 2018-01-19 09:57:57 -06:00
kevinz000
b7df40727d You can now buckle people to target stakes (#34514) 
* Update target_stake.dm

* Update target_stake.dm

* Update target_stake.dm
 2018-01-19 09:52:42 -06:00
Jordan Brown
5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest 
fixes supply drop pods being impossible to dissassemble
 2018-01-19 09:43:21 -06:00
Jordan Brown
f0b02fac56 Merge pull request #34501 from AutomaticFrenzy/patch/mapping-scrubbers 
Allow mapping non-default scrubbers
 2018-01-19 09:38:04 -06:00
Jordan Brown
0c9adb1ef6 Merge pull request #34641 from DaxDupont/belt-power 
Fixes conveyor belt power usage.
 2018-01-19 09:30:23 -06:00
uraniummeltdown
7f5f255ce7 jaunting wraiths should now always be facing the correct direction in their animation and sprite before and after jaunt (#34547) 2018-01-19 09:29:10 -06:00
Jordan Brown
e963853a89 Adds byond versions to feedback (#34616) 2018-01-19 09:24:36 -06: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