shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,992 Commits 5 Branches 0 Tags
ba16e3a100fa1bea7eb424cd30b18d4cb67f719d
Commit Graph

4531 Commits

Author SHA1 Message Date
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -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
LetterJay
36dd99b376 Merge pull request #4874 from Citadel-Station-13/upstream-merge-34505 
[MIRROR] Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 13:50:10 -06:00
LetterJay
01344aacdf Merge pull request #4868 from Citadel-Station-13/upstream-merge-34171 
[MIRROR] Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside.
 2018-01-16 13:48:40 -06:00
LetterJay
ba5d3c8938 Merge pull request #4867 from Citadel-Station-13/upstream-merge-34479 
[MIRROR] newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 13:48:26 -06:00
LetterJay
8b89832d76 Merge pull request #4864 from Citadel-Station-13/upstream-merge-34463 
[MIRROR] Fixes duplicate reagents in chemistry macros
 2018-01-16 13:47:50 -06:00
LetterJay
4f85c676b2 Merge pull request #4862 from Citadel-Station-13/upstream-merge-34455 
[MIRROR] Fixes shuttle console negative auths needed
 2018-01-16 13:47:22 -06:00
LetterJay
2f2b98c4eb Merge pull request #4861 from Citadel-Station-13/upstream-merge-34460 
[MIRROR] Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 13:47:10 -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
Jordan Brown
5e7e4c934d Merge pull request #34505 from AutomaticFrenzy/patch/camera-failure-crash 
Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 08:39:54 -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
Jordan Brown
9df836baca Merge pull request #34479 from F-OS/patch-5 
newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 08:29:24 -06:00
Jordan Brown
292fb13612 Merge pull request #34463 from DaedalusGame/micro_fix 
Fixes duplicate reagents in chemistry macros
 2018-01-16 07:40:47 -06:00
kevinz000
47c74443da Fixes negative auth coutns 2018-01-16 07:40:29 -06:00
Jordan Brown
7a3c222758 Merge pull request #34460 from AnturK/whyijustwastedhalfanhourlookingforatypo 
Fixes ChangeTurf runtimes in late loaded templates.
 2018-01-16 07:39:14 -06:00
AnturK
89766bdc4e Makes getFlatIcon slower. (Also more precise) (#34199) 
* getFlatIcon fixes and improvements. DO NOT TOUCH

* Fixes area blendings

* Stuff

* Drops the named arg
 2018-01-16 07:33:41 -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
LetterJay
6a2a9ff6f5 Merge pull request #4855 from Citadel-Station-13/upstream-merge-34266 
[MIRROR] Goats eat plant people
 2018-01-16 03:53:55 -06:00
LetterJay
efb1239ef4 Merge pull request #4848 from Citadel-Station-13/upstream-merge-34441 
[MIRROR] Fixes hardsuits in templates
 2018-01-16 03:51:51 -06:00
LetterJay
38ea4d6bf8 Merge pull request #4847 from Citadel-Station-13/upstream-merge-34428 
[MIRROR] Fixes jaunters
 2018-01-16 03:51:40 -06:00
LetterJay
7b673a4262 Merge pull request #4846 from Citadel-Station-13/upstream-merge-34061 
[MIRROR] Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-16 03:51:30 -06:00
oranges
c990906791 Merge pull request #34266 from KorPhaeron/goat 
Goats eat plant people
 2018-01-15 15:54:42 -06:00
AnturK
105ff6a3bc Fixes hardsuits in templates 2018-01-15 12:36:23 -06:00
kevinz000
81bc49cafe Fixes Jaunters 2018-01-15 12:05:46 -06:00
deathride58
30af76a0a2 Merge pull request #4845 from Citadel-Station-13/upstream-merge-34325 
[MIRROR]  Makes the lavaland mining base have more correct baseturfs
 2018-01-15 15:40:45 +00:00
deathride58
f595c71b8f Merge pull request #4844 from Citadel-Station-13/upstream-merge-34354 
[MIRROR] Xenomorph maids (and Barmaids) clean on move
 2018-01-15 15:40:23 +00:00
deathride58
bd90207710 Merge pull request #4843 from Citadel-Station-13/upstream-merge-34309 
[MIRROR] Remakes the space syndicate listening post.
 2018-01-15 15:39:32 +00:00
deathride58
aea0bb0394 Merge pull request #4842 from Citadel-Station-13/upstream-merge-34371 
[MIRROR] Fixes missing pipe colors in RPD and pipe painter
 2018-01-15 15:39:04 +00:00
Kyle Spier-Swenson
32adfdae00 Fixes compiler errors in the preload_rsc external resource thingy (#34061) 
Fixes compiler errors in the preload_rsc external resource thingy
 2018-01-15 09:33:07 -06:00
Emmett Gaines
a2bc36a791 makes the lavaland mining base have more correct baseturfs (#34325) 2018-01-15 08:43:08 -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
WJohn
16596405e1 Remakes the space syndicate listening post. (#34309) 
* Remakes the space syndicate listening post. TGM in a second.

* TGM of the map

* Removes space suit from EVA.

* Removes bed and dirty var.
 2018-01-15 07:18:15 -06:00
ShizCalev
8f1a21b2be Fixes missing pipe colors in RPD and pipe painter (#34371) 2018-01-15 03:01:36 -06:00
coiax
497e6bb13f Various deadchat messages are more informative and consistent (#34326) 
More deadchat messages now follow the following format.

> George Mellons has done a thing at AreaName.

- Shuttle calling
- Shuttle recalling
- Security level changing
- Maintenance accessing
- Swiping for red,emergency maint, bsa
- Messenging centcom, syndicate

Fixes #34230.
Fixes #34231.
 2018-01-15 02:56:10 -06:00
deathride58
c63028e8bc Merge pull request #4829 from Citadel-Station-13/upstream-merge-34384 
[MIRROR] Quality of life: Newly constructed APCS are unlocked
 2018-01-15 06:18:59 +00:00
deathride58
741dba1a9f Merge pull request #4837 from Citadel-Station-13/upstream-merge-34373 
[MIRROR] The Express Console emag effect is now a proper emag effect
 2018-01-15 06:18:10 +00: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
deathride58
a886b53253 Merge pull request #4832 from Citadel-Station-13/upstream-merge-34395 
[MIRROR] fixes for mouse race
 2018-01-15 06:16:17 +00:00
Iamgoofball
dcd61e0ba4 The Express Console emag effect is now a proper emag effect (#34373) 
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
 2018-01-14 23:48:55 -06: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
Leo
4b56baf1a6 Merge pull request #34372 from YPOQ/slimestopfix 
Fixes players not being immune to their own slime timestops
 2018-01-14 21:35:50 -06:00
Leo
2b4735ded0 Merge pull request #34384 from F-OS/patch-3 
Quality of life: Newly constructed APCS are unlocked
 2018-01-14 21:32:38 -06:00
deathride58
071235d790 Update uplink.dm 2018-01-14 18:01:56 -05:00
oranges
ef200d44c5 Added tooltips to roundend traitor purchase logs 2018-01-14 16:43:11 -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
6162d812f4 Merge pull request #4825 from Citadel-Station-13/upstream-merge-34123 
[MIRROR] Moves GLOB.movement_keys into SSinput and adds movement direction badminry
 2018-01-14 20:42:40 +00:00
deathride58
96ffb89fc1 Merge pull request #4823 from Citadel-Station-13/message-visibility 
Fixes message visibility for vorish play
 2018-01-14 20:42:13 +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