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

1701 Commits

Author SHA1 Message Date
LetterJay
23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133 
[MIRROR] Temperature Refactor and Fixes
 2018-01-21 11:47:08 -06:00
Robustin
e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Dax Dupont
4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497) 
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
 2018-01-21 02:04:47 -06:00
Jordan Brown
b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix 
Actually fixes wag emote runtime
 2018-01-20 14:09:58 -06:00
Jordan Brown
bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery 
Fixes missing MakeSlippery() args
 2018-01-20 14:09:49 -06:00
LetterJay
097f2b2ddf Update life.dm 2018-01-20 13:18:25 -06:00
LetterJay
a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
XDTM
b13be9240c Fixes slimes not attacking anybody 2018-01-19 19:29:52 -06: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
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
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
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
deathride58
4aa52b8d99 Update life.dm 2018-01-19 14:32:40 -05:00
Jordan Brown
7b9fda5411 Merge pull request #34591 from XDTM/goodBoy 
Fixes slimes attacking people with the slime faction
 2018-01-19 09:24:45 -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
aa5e57e3a6 Fixes slimepeople not being able to open the bodyswap menu 2018-01-19 09:17:31 -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
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
AnturK
3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
Robustin
7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -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
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
deathride58
3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains 
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
 2018-01-18 06:28:04 +00:00
deathride58
8c743141da Merge pull request #4721 from deathride58/genitalexamine 
Exposed genitals will now add details onto examine text
 2018-01-18 04:56:50 +00:00
LetterJay
59e5a71e78 Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468 
[MIRROR] Cleans up some redundant stripped_input usage
 2018-01-17 09:45:04 -06:00
LetterJay
ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
oranges
2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
LetterJay
6bcd56a0f3 Merge pull request #4875 from Citadel-Station-13/upstream-merge-34482 
[MIRROR] Drone dispensers no longer trap the drones below them forcing ghosts to altclick
 2018-01-16 13:50:29 -06:00
F-OS
3608165d7f Drone dispensers no longer trap the drones below them forcing ghosts to altclick (#34482) 
* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* Update drones_as_items.dm

* I've got PRs to close, no time to wait on you
 2018-01-16 08:45:16 -06:00
kevinz000
da30215a48 Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside. (#34171) 
* Flash Refactor

* Update flash.dm

* Update flash.dm
 2018-01-16 08:30:36 -06:00
LetterJay
59b5956447 Merge pull request #4826 from deathride58/hopefullyfixesshit 
Hopefully fixes human tails/ears not saving, and fixes new/random characters having underwear
 2018-01-16 05:03:05 -06:00
oranges
c990906791 Merge pull request #34266 from KorPhaeron/goat 
Goats eat plant people
 2018-01-15 15:54:42 -06:00
coiax
c3d0e7d2b5 Xenomorph maids (and Barmaids) clean on move (#34354) 
🆑 coiax
add: A xenomorph maid (or barmaid) cleans the floor as they walk on it.
Lie down, and they'll clean your face.
/🆑

- Clearly a massive xenobiology buff by letting them create simple mob
janitors.
- Actually implemented so the Barmaid can clean up the Emergency Escape
Bar, but sure, let's buff the regular maid as well.
 2018-01-15 08:01:18 -06:00
deathride58
2b859638e9 Merge pull request #4836 from Citadel-Station-13/upstream-merge-34396 
[MIRROR] Fixed alt-click not working with stacks
 2018-01-15 06:17:51 +00:00
John Ginnane
ac1b2f76ef Fixed alt-click not working with stacks (#34396) 
* Can disable auto-merge

New argument which lets you stop stacks from automatically merging when picking them up

* Fix 0 stacks

* Updated simple_animal/put_in_hands()
 2018-01-14 22:05:07 -06:00
Tlaltecuhtli
37fa7830ec Fixes eating mouse grammar (#34395) 2018-01-14 22:01:31 -06:00
Tlaltecuhtli
ac14a5b4e8 sfds (#34392) 2018-01-14 15:42:06 -06:00
deathride58
c3ce0d8f28 Merge pull request #4821 from Citadel-Station-13/wagfix2018 
Fixes *wag for mammals
 2018-01-14 21:12:01 +00:00
deathride58
927913662d hopefully fixes new characters having underwear and fixes human tails/ears not saving 2018-01-14 15:25:13 -05:00
Poojawa
e385ab090e Fixes message visibility for vorish play 
It's the little things I have to prune.
 2018-01-14 12:01:24 -06:00
Poojawa
655067471a Fixes *wag for mammals 
Someone forgot that we have snowflake bodyparts.
 2018-01-14 03:50:26 -06:00
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
50529187d6 Fixes mecha pilot speed. 2018-01-13 14:51:10 -06:00
deathride58
6df769de46 Merge pull request #4807 from Citadel-Station-13/upstream-merge-34358 
[MIRROR] Cleans up a nesting level in pet attackby
 2018-01-13 20:27:12 +00:00
deathride58
412e43674c Merge pull request #4806 from Citadel-Station-13/upstream-merge-34342 
[MIRROR] for var i in 1 to dildos
 2018-01-13 20:26:49 +00:00
deathride58
9742597382 Merge pull request #4801 from Citadel-Station-13/upstream-merge-34343 
[MIRROR] Penguins are immune to cold
 2018-01-13 20:25:01 +00:00