Commit Graph

26797 Commits

Author SHA1 Message Date
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
Layne
4d842c6590 Adds snowballs. (#4414) 2017-12-07 17:51:36 -06:00
Belsima
b819963102 Flashes now click when they say they click. (#4393)
* Flashes now click when they say they click.

* Better sound effect.
2017-12-07 17:50:12 -06:00
mistyLuminescence
4b102b7870 Adds food bags! (#4389) 2017-12-07 17:49:59 -06:00
Mechoid
820b41575d Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413) 2017-12-07 17:32:26 -06:00
Anewbe
1499a48238 Merge pull request #4410 from Belsima/fuckssake
can you seriously not spell sticky
2017-12-07 17:31:29 -06:00
Anewbe
395e7693b4 Merge pull request #4416 from Verkister/patch-1
Makes player simplemobs able to finish off snacks.
2017-12-07 17:29:30 -06:00
MisterLayne
05954a278a K. 2017-12-06 16:14:55 -05:00
Verkister
cce138b094 Makes player simplemobs able to finish off snacks.
No more endless futile nibbling. Tested working fine.
2017-12-06 20:57:54 +02:00
Belsima
bb6d52d13d Adds blennophobia. (#4397)
* Adds blennophobia.

* Adds blennophobia to character setup.

* fear updates
2017-12-05 23:51:36 -06:00
Belsima
c9d53f5aa4 Maint drones may now ventcrawl. (#4394)
* Maint drones may now ventcrawl.

* Drones can now have any items they want in vents. No stowing needed.
2017-12-05 23:49:10 -06:00
Mechoid
931056877f Merge pull request #4391 from Anewbe/ghosts
Ghosts no longer show up over living mobs
2017-12-05 21:44:23 -08:00
Neerti
fab9a877cc Merge pull request #4390 from Anewbe/species_blood_tweaks
Makes species bleed out faster or slower
2017-12-06 00:43:59 -05:00
Anewbe
a841d57239 Changes the Laser Carbine/Rifle 2017-12-05 23:36:05 -06:00
Belsima
3bf74de3b1 Grammar time, again. (#4402)
* Shriek grammar.

* Updates jumpsuit grammar.

* Update civilian.dm

* Update NewBan.dm

* Update gravitygenerator.dm

* Update Dreaming.dm

* Update shriek.dm

* Update NewBan.dm
2017-12-05 14:34:45 -06:00
Anewbe
690c041aa4 Merge pull request #4396 from PrismaticGynoid/ghostlocker
Ports ghosts examining locker contents
2017-12-05 14:34:18 -06:00
Anewbe
73991e697e Merge pull request #4395 from PrismaticGynoid/geigerghost
Ports check_radiation verb for ghosts
2017-12-05 14:34:05 -06:00
Mechoid
c72e7310e3 Merge pull request #4398 from mistyLuminescence/laythebikeshedtorest
PsychHUD!
2017-12-05 10:11:55 -08:00
Belsima
d266b67eba can you seriously not spell sticky 2017-12-05 12:50:04 -05:00