Commit Graph

4540 Commits

Author SHA1 Message Date
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
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
0381765c81 Merge pull request #4883 from Citadel-Station-13/upstream-merge-34473
[MIRROR] Nerfs techweb cargo points
2018-01-17 09:39:54 -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
LetterJay
9fbbb018e8 Merge pull request #4879 from Citadel-Station-13/upstream-merge-34457
[MIRROR] Combine and fix Show Air Status and Air Status in Location
2018-01-17 09:36:56 -06:00
oranges
ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
oranges
4a6b246b4c Merge pull request #34473 from kevinz000/techwebs_points
Nerfs techweb cargo points
2018-01-16 14:31:12 -06:00
kevinz000
ba16e3a100 Fixes lavaboat buckling (#34450)
* Buckle order

* lavaboats
2018-01-16 14:31:02 -06:00
oranges
9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status
Combine and fix Show Air Status and Air Status in Location
2018-01-16 14:29:29 -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
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