Commit Graph

26815 Commits

Author SHA1 Message Date
Leshana
c6e8184b58 Ports https://github.com/tgstation/tgstation/pull/30184
* Adds defines for world.tick_usage
* This provides no useful benefit whatsoever, but /tg and Baystation12 have done it, so it will make porting future code easier if we do too.  No real harm done either.
2017-12-27 19:10:15 -05:00
Leshana
032d26010b Merging changes from /tg
https://github.com/tgstation/tgstation/pull/29637 Fixes subsystem MC crash tracking
https://github.com/tgstation/tgstation/pull/30092 Subsystem PreInit() now respects init_order
2017-12-27 18:58:51 -05:00
Neerti
522a3b5f98 Merge pull request #4456 from VOREStation/vplk-frames
Replaced bare numbers in frame construction with defined constants.
2017-12-26 22:37:33 -05:00
Leshana
00a00bb1c8 Use mutable_appearance for HUD health overlays.
This improves the issue of player mobs using excessive CPU every Life() tick.
* Testing determined the worst performance was actually the manipulation of the "healths" HUD doll's overlays.
* Switching to using a mutable_appearance helps quite a bit for little effort.
2017-12-26 17:07:10 -05:00
BothNevarBackwards
4540f770d4 Lots of species stuff ported from Baystation (#4442)
* Ports species based footprints from bay
- https://github.com/Baystation12/Baystation12/pull/17935
- https://i.imgur.com/ojAU373.png
- Unathi use claw on right
- Taj and tesh use paw in center

* Flash stuff glasses protection things

* Flash stuff actual thing

* Organ mult thingy

* Floaty eyes and cloak setup

* Species falling
2017-12-26 14:28:21 -05:00
Anewbe
ddbf7138d9 Merge pull request #4455 from Woodratt/12242017_SCadditions_WR
SC Stupid Sized Map Update
2017-12-26 13:16:46 -05:00
Atermonera
c8f6ef9e9f Merge branch 'master' into VR_Avatar 2017-12-24 15:50:21 -08:00
Atermonera
34dd521fb8 VR mobs can toggle opaque/translucent appearance 2017-12-24 15:42:13 -08:00
Leshana
8a8e51bec4 Replaced bare numbers in frame construction with defined constants.
Also examine() frames shows the circuit that is installed.
2017-12-24 17:53:58 -05:00
Woodratt
ed9395e58f SC Stupid Sized Map Update
Or how Woodrat spent too long on something that was supposed to be simple.

- Addition of a Explorer Radio Channel and headsets.
- Explorers and Search and Rescue job slots added
- Adjustments to the pilot job including getting rid of the flatcap
- Map fixes, adjustments, (including signs pointing to cryo) planetside side map additions splitting up of the wilderness into two area sections
- Disabled lighting on the arrivals shuttle area once it is docked with the station, should help with the whole issue of lighting bugging out and having dark space
- Fixed EMS jacket missing icons
- Fixed Research signs being missing for some reason, addition of directional signs for cryo
- Addition of a Search and Rescue Winter coat
- Probably a dozen other small bug fixes I forgot, and bug additions

Tested, seems fine. At least in short tests.
2017-12-24 07:04:34 -08:00
mistyLuminescence
c986d57c34 Med Pill Blue Pill (#4404)
* Fixes 4412
* Rebalanced medical gear spawns
* Pill bottle code touched up
2017-12-23 14:45:24 -08:00
MarinaGryphon
828b927a4d You can now remove card decks from containers. (#4452)
* You can now remove card decks from containers.

* Typecasting.

* Conditional fixes.
2017-12-22 19:33:13 -06:00
Atermonera
4b2ac88720 Research level typos 2017-12-17 19:48:15 -08:00
mistyLuminescence
9a86b05471 Grind up some more stuff! (#4423)
*More types of sheets can be ground up in a grinder
2017-12-17 13:43:10 -08:00
Neerti
595dee475a Merge pull request #4441 from Nalarac/OddySleeper
Fixes Odysseus Sleeper Being Unable to Inject Chemicals
2017-12-17 13:04:27 -05:00
Verkister
d83b142603 More missed limb icon null checks.
-Should probably decrease crashing even further.
2017-12-17 14:32:58 +02:00
Andrew
eba7b63937 Fixes Odysseus Sleeper Being Unable to Inject Chemicals
Fixes #869
Reduces inject to 5 per instead of 10 per (same cap)
Adds verb for occupants of sleeper to eject themselves
2017-12-16 13:23:44 -06:00
Cameron653
91df60a30d Makes galoshes shockproof 2017-12-15 19:37:56 -05:00
Anewbe
721c7a5291 Merge pull request #4435 from Belsima/plant
Tracking implant multi-z fix.
2017-12-14 21:30:58 -06:00
Atermonera
32e9e0a602 Merge pull request #4201 from Anewbe/necrosis_surgery
Surgery updates
2017-12-13 19:57:06 -08:00
Anewbe
3b89c5e320 Merge pull request #4384 from Belsima/maid
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
Anewbe
c0615e47cf Merge pull request #4437 from Belsima/whatifgammer
more grammer
2017-12-12 19:31:06 -06:00
Anewbe
393144068e Merge pull request #4427 from MisterLayne/fear_of_needles
Trypanohpobia
2017-12-12 19:30:01 -06:00
Atermonera
218ac6e630 ABS and sleepers reject non-human mobs (#4433)
* ABS and sleepers reject non-human mobs

* No more slime procreation
2017-12-12 19:27:36 -06:00
Anewbe
f32361350b Merge pull request #4432 from Atermonera/VR_Exit
Moves Exit VR verb to avatars
2017-12-12 19:27:29 -06:00
Anewbe
e228252d52 Merge pull request #4434 from Atermonera/Xmas_Borg_Crackers
Xmas crackers work on borgs
2017-12-12 19:18:12 -06:00
Neerti
1066e14790 Merge pull request #4422 from Anewbe/utilities
Removes the military clothing from the loadout, repaths things
2017-12-12 20:16:33 -05:00
MisterLayne
ccc88ed9d1 Fear the needle (in that person's hand, too). 2017-12-12 16:18:33 -05:00
Belsima
430746d863 more grammer 2017-12-11 20:33:59 -05:00
Belsima
600bae5ac9 Update prisoner.dm 2017-12-11 11:25:50 -05:00
Atermonera
c47794b54b Christmas Crackers work on borgs 2017-12-10 23:03:17 -08:00
OrbisAnima
24ceb65752 Port: Metamorphic Glasses (#4428)
* Port: Metamorphic Glasses

Basically, this just adds the old style glasses to the code without
removing anything.

https://imgur.com/eeqjW7c

Glasses can be found in the bar vendor, or can be ordered with the
bar/party supplies like any other glasses.

* Port: Metamorphic Glasses - Fix

Removed the relative path. Tested
2017-12-11 00:52:20 -06:00
mistyLuminescence
203110bc8f Fixes rollers and mediborgs (#4430)
* Fixes rollers and crisis borgs

* a space
2017-12-11 00:47:52 -06:00
Anewbe
ebdf9b191b Merge pull request #4425 from MisterLayne/energy_spear_fixed
Energy Spear
2017-12-11 00:47:05 -06:00
SubberTheFabulous
9dbb99b515 Adds yet another FBP, also fixes a little sprite error (#4419)
* Adds new set of cyberlimbs, fixes annoying sprite

* Adds a new set of robolimbs

FOR SOME REASON

* Fixes stuff

i miss things ok

* Update robolimbs.dm

* Update robolimbs.dm
2017-12-11 00:46:51 -06:00
Anewbe
8e51d6d9a0 Merge pull request #4424 from PrismaticGynoid/crawl
Crawling
2017-12-11 00:46:16 -06:00
Atermonera
24287a1913 Moves Exit VR verb to avatars 2017-12-10 16:31:27 -08:00
Cameron653
be59b4cbff Fixes Cerulean slime enhancer
How did nobody stumble over this since the rework
2017-12-10 00:04:38 -05:00
Belsima
dd991a1475 Replaces cola machine sprite. (#4387)
* Replaces cola machine sprite.

* fix
2017-12-09 16:44:33 -06:00
Mewchild
e97b301838 Take two. New drinks (#4259)
* Adds new drinks

Adds many new drinks. Adds bitters, a staple for mixing.

* Fixes errors.

Also shut up travis :c

* Fixes Bitters/Buracao conflict

Makes it so that bitters require water and more enzyme, to avoid a
conflict with Blue Curacao

* Bitters use mint instead of orange

A more elegant solution to my last

* Removes duplicate

Rotgut was defined twice.

* Another duplicate

Mojito got defined twice.

* Adds Cold Front

Cold Front - 1 Iced Coffee, 1 Whiskey, 1 Mint. Lowers body temperature
by a severe amount. (Functionally the opposite of antifreeze)

* Fixes spacing issues

Changes Four Space to Tab indent

* Requested changes

Makes new milkshakes children of milkshake
Lowers Named Bullet slime jelly to 0.25u, down from 2u
Fixes a mismatch in amounts on the mint julep

* Fixed undefined drinks

Defines Mint Julep and Love potion
2017-12-09 16:25:06 -06:00
MisterLayne
0e5a097534 Second time is the charm. 2017-12-09 09:38:03 -05:00
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute
Adds parachutes
2017-12-08 20:17:51 -05:00
Anewbe
b1c16837cb Redoes the whole surgery PR 2017-12-08 18:35:50 -06:00
Belsima
8d3ceab287 grammar never ends (#4421)
* Update Sleeper.dm

* Update robot_fabricator.dm

* Update requests_console.dm

* Update vr_console.dm

* Update teleporter.dm

* Update records_scanner.dm

* Update mercrenegade.dm

* Update clown_items.dm

* Update firstaid.dm

* Update teleporter.dm

* capitalization fixes

* Update clown_items.dm
2017-12-08 15:30:34 -06:00
PrismaticGynoid
1642ce2558 Crawling
Mobs now have the ability to "crawl" to an adjacent turf by click-dragging themselves to it. This would allow people unable to stand to still move around, though very slowly. You could also do this to other movable mobs or objects, if you really wanted to.

Moving this way takes about 2.5 seconds, plus half a second for each point of weakness you have. For a person missing a leg, this would take 5 seconds. It only works if the mob doing this is alive, conscious, unrestrained, not stunned or paralyzed, and in an area with gravity - no crawling through space.

Mobs lying on the ground - again, with similar restrictions - are now able to buckle themselves to chairs or beds. For people missing legs or feet, this means no more being stuck helpless on the ground forever because Baldie McGreytide clicked on your wheelchair.

Tested in many different situations, and I've patched every bug that popped up.
2017-12-08 10:26:06 -08:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06:00
Mechoid
1175713235 Merge pull request #4408 from Anewbe/adv_kit_tweaks
Reduces adv medical item healing from 5 to 3
2017-12-07 16:22:13 -08:00
Mechoid
08ad1c8e64 Merge pull request #4415 from Anewbe/carbine
Changes the Laser Carbine/Rifle
2017-12-07 16:21:22 -08:00
Belsima
ad0ad62cde The game actually clicks when it claims to. (#4403)
* Update paiwire.dm

* Update life.dm

* Update traps.dm

* Update safe.dm

* Update alarm.dm

* Update safe.dm

* Update implant.dm

* Update life.dm

* Update traps.dm

* Update life.dm

* Update safe.dm

* Audible message test
2017-12-07 18:18:01 -06:00
Anewbe
573d3a1bbd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
# Conflicts:
#	icons/obj/storage.dmi
2017-12-07 17:59:13 -06:00