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

4511 Commits

Author SHA1 Message Date
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
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
Emmett Gaines
e27346812f Moves GLOB.movement_keys into SSinput and adds movement direction badminry (#34123) 
* badmin flip dirs

* moves movement_keys into SSinput from GLOB
 2018-01-14 13:39:01 -06: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
7498bae414 Re-adds AK-47s button 
ستالين هو أعظم

You're welcome.
 2018-01-14 04:18:17 -06:00
Poojawa
655067471a Fixes *wag for mammals 
Someone forgot that we have snowflake bodyparts.
 2018-01-14 03:50:26 -06:00
LetterJay
703275c86f Merge pull request #4803 from Citadel-Station-13/upstream-merge-34276 
[MIRROR] Update TGS API to 3.2.0.2
 2018-01-14 03:12:31 -06:00
deathride58
9332db5bb0 Fixes character slot changing runtiming 2018-01-13 23:08:50 -05: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
257ee69202 Merge pull request #4811 from Citadel-Station-13/upstream-merge-34360 
[MIRROR] Fixes clownborg sprays not recharging
 2018-01-13 20:29:01 +00:00
deathride58
c47008b123 Merge pull request #4808 from Citadel-Station-13/upstream-merge-34357 
[MIRROR] Fix RPD runtimes and offsets of layered connector ports
 2018-01-13 20:27:54 +00: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
3da566f86b Merge pull request #4805 from Citadel-Station-13/upstream-merge-34346 
[MIRROR] Fix slot machine design icon
 2018-01-13 20:26:28 +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
deathride58
7ec007d204 Merge pull request #4800 from Citadel-Station-13/upstream-merge-34352 
[MIRROR] Remove unnused random event
 2018-01-13 20:24:42 +00:00
deathride58
0cad3946c3 Merge pull request #4799 from Citadel-Station-13/upstream-merge-34161 
[MIRROR] Consolidates bot assemblies under one parent, fixes bot parts switching types when the bot is destroyed
 2018-01-13 20:24:13 +00:00
deathride58
b586ec55a7 Merge pull request #4798 from Citadel-Station-13/upstream-merge-33958 
[MIRROR] Dreaming Improvements
 2018-01-13 20:23:03 +00:00
deathride58
9c19710b72 Merge pull request #4797 from Citadel-Station-13/upstream-merge-34155 
[MIRROR] Allows admins to select an outfit while transforming a mob to human via rudimentary transform
 2018-01-13 20:22:23 +00:00
deathride58
9ccd21605d Merge pull request #4795 from Citadel-Station-13/pbchange 
Panic bunker notice change
 2018-01-13 20:21:43 +00:00