Commit Graph

16617 Commits

Author SHA1 Message Date
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
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
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
Cameron653
be59b4cbff Fixes Cerulean slime enhancer
How did nobody stumble over this since the rework
2017-12-10 00:04:38 -05: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
Neerti
791754b2de Merge pull request #4382 from Anewbe/parachute
Adds parachutes
2017-12-08 20:17:51 -05:00
Anewbe
ff1103c7d9 Removes the military clothing from the loadout, repaths things 2017-12-07 21:21:05 -06: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
Mechoid
820b41575d Adds Mining Drones and a fabricator for them. Hooray amending commits, also. (#4413) 2017-12-07 17:32:26 -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
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
Anewbe
d2a90fcec4 Fixes High Cap water tanks, lets drones move tanks again. 2017-12-04 17:43:57 -06:00
mistyLuminescence
532cc711fa PsychHUD! 2017-12-04 00:05:10 +00:00
PrismaticGynoid
ba271e168b Ports check_radiation verb for ghosts
From https://github.com/Baystation12/Baystation12/pull/19390 . Ghosts now have a check radiation verb they can use to see the radiation level of where they're standing, similar to geiger counters. Tested in every scenario involving radiation I could think of, and it works just fine.
2017-12-03 15:43:01 -08:00
mistyLuminescence
0d458b204e Adds the advanced health analyzer (#4326)
* WIP - advanced health analyzer

* Adds the advanced health analyzer.

* Updates radiation levels

* Fixes travis and removes snark

* Fixes a bug that wasn't my fault (for real)

* Adds tiers.

* Phasic sounds cooler

* Fixes sprites
2017-12-03 17:36:51 -06:00
mistyLuminescence
c2c8d52a12 RUST updates (#4325)
* RUST updates

* Makes RUST work, this time with fusion reagents too
2017-12-03 17:35:41 -06:00
Anewbe
4d938d58bb Ghosts no longer show up over living mobs 2017-12-02 19:43:44 -06:00
Anewbe
c95206c9f3 Makes species bleed out faster or slower 2017-12-02 18:14:35 -06:00
Mechoid
5931a8cf34 Merge pull request #4377 from Anewbe/roller_chairs
Can no longer run around while in a roller chair
2017-12-02 16:11:20 -08:00
Anewbe
e51f3aad61 Fixes sprites, moves planetary explosion to fall_impact 2017-12-02 16:36:50 -06:00
Belsima
74aeaaa7ea Fixes circuit icon states. 2017-12-02 09:09:19 -05:00
Anewbe
132168bc81 Further parachute functionality 2017-12-01 22:11:38 -06:00
Anewbe
c2a8afb7c0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute
# Conflicts:
#	icons/mob/back.dmi
#	icons/obj/storage.dmi
2017-12-01 18:47:06 -06:00
Anewbe
085c33e39a Adds parachutes 2017-12-01 18:37:30 -06:00
Anewbe
8ab356a96e Merge pull request #4376 from Neerti/10/28/2017_new_blob
Adds New Blob
2017-11-30 22:44:47 -06:00
Neerti
c4e19538b0 Merge pull request #4371 from Anewbe/phoron_contamination
Contaminated items now respect gloves
2017-11-30 20:43:27 -05:00
Anewbe
ba7ada513b Can no longer run around while in a roller chair 2017-11-29 23:18:52 -06:00
Neerti
f016f26e66 Travis Appeasement 2017-11-29 23:33:25 -05:00
Neerti
af5c633cdb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 10/28/2017_new_blob
# Conflicts:
#	code/game/atoms_movable.dm
2017-11-29 22:43:05 -05:00
Neerti
acb208dd3f Works on New Blob 2017-11-29 22:35:01 -05:00
Neerti
70d49a1c3a Merge pull request #4181 from Anewbe/radiation_tweaks
Adjusts how radiation works, especially for FBPs
2017-11-29 21:17:16 -05:00
Anewbe
21ae066f6c Merge pull request #4367 from Neerti/11/28/2017_variable_click_delay
Adds Variable Click Delay
2017-11-29 12:53:15 -06:00
Mechoid
6d95e19274 Merge pull request #4361 from Anewbe/explorer_headlight
The Explorer Hood now has a headlight
2017-11-29 10:51:24 -08:00
Anewbe
b3eeadfe8c Merge pull request #4366 from Kholdstare34/outbox
Adds yet another damn hairstyle.
2017-11-29 12:51:02 -06:00
Anewbe
3633a787e2 Merge pull request #4360 from Cyantime/mousebump
Mobs can't push objects that they can't pull.
2017-11-29 12:50:47 -06:00
Anewbe
a8e3dd4d1b Merge pull request #4365 from Neerti/11/27/2017_wild_slimes
Adds a Wild Slime type for future surface-things.
2017-11-29 12:50:25 -06:00
Anewbe
37101b9b39 Contaminated items now respect gloves 2017-11-28 23:56:13 -06:00
Anewbe
b07ac2e6fa Readds the check_new_players admin verb 2017-11-28 17:42:35 -06:00