Commit Graph

15532 Commits

Author SHA1 Message Date
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
Anewbe
8e51d6d9a0 Merge pull request #4424 from PrismaticGynoid/crawl
Crawling
2017-12-11 00:46:16 -06:00
Belsima
dd991a1475 Replaces cola machine sprite. (#4387)
* Replaces cola machine sprite.

* fix
2017-12-09 16:44:33 -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
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
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
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
Anewbe
1499a48238 Merge pull request #4410 from Belsima/fuckssake
can you seriously not spell sticky
2017-12-07 17:31:29 -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
Belsima
d266b67eba can you seriously not spell sticky 2017-12-05 12:50:04 -05:00
Anewbe
d0c580e0cb Reduces adv medical item healing from 5 to 3 2017-12-04 18:35:01 -06: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
PrismaticGynoid
fe9d6864c0 Ports ghosts examining locker contents
A port of https://github.com/Baystation12/Baystation12/pull/19436 . Ghosts clicking on a locker or crate to examine it can now see a list of its contents.
2017-12-03 15:25:04 -08:00
Anewbe
e51f3aad61 Fixes sprites, moves planetary explosion to fall_impact 2017-12-02 16:36:50 -06:00
Anewbe
5fffb9d51f Merge pull request #4378 from Neerti/12/1/2017_reaching_weapons
Adds Reach Variable to Weapons
2017-12-02 12:00:26 -06:00
Belsima
0a76047cef Loadout adjustments. 2017-12-02 08:59:46 -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
Layne
3f21df1ae2 Fixy fixy. (#4314) 2017-12-01 16:18:20 -06:00
Anewbe
5bf6d4f9c0 Merge pull request #4380 from Woodratt/12012017_SC_Calambugfixes
Further SC bug fixes
2017-12-01 16:15:57 -06:00
Woodratt
9f71125f13 Further SC bug fixes
- Bug fixes and additions
- Finishes out floor decal work
- Adds tiny Christmas stuff
2017-12-01 14:01:31 -08:00
mistyLuminescence
4d44d47a59 Mobile Camera Pods (#4330)
* Adds tactical cameras!

* Adds MCP crate

* Destroy the tac-cams!

* Updates description

* Removes MCP box from Armory

* we can't actually get MCPs any more
2017-12-01 16:00:49 -06:00
Neerti
5796b14220 Adds Reach Variable to Weapons
Melee weapons can now potentially attack from farther away.
Obstacles are taken into account, so you cannot hit people through windows, but you can attack over specific things such as tables, or other people.
Currently only the spear can do this, with a range of two tiles, however the attack speed for the spear was reduced, so it may remain a situational weapon.
The intention for this is to make specific weapons feel different to each other besides 'does more damage', and I got ideas on other kinds of weapon adjustments later to make them feel a bit more unique.
2017-12-01 12:42:40 -05: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
Neerti
2f7db506eb Adds Variable Click Delay
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
Anewbe
adcb39b727 Fixes rollerbed sprites 2017-11-28 00:10:00 -06:00
Neerti
667931ae2d Merge pull request #4338 from Belsima/signs
Adds signs.
2017-11-27 20:22:24 -05:00
Neerti
6060f99ee0 Merge pull request #4340 from Belsima/orthodoxy
Bible additions.
2017-11-27 20:20:42 -05:00
Neerti
8fedfa205f Merge pull request #4357 from Cyantime/communicator
Allows communicators to be made by RnD, shows ghosts communicator IMs
2017-11-27 20:19:59 -05:00
mistyLuminescence
e4ff301c01 Advanced Roller Bed (#4319)
* Adds the advanced rollerbed to R&D

* default surgery rate

* finally
2017-11-27 16:40:52 -06:00
Anewbe
1cb9503790 Merge pull request #4344 from MisterLayne/you_do_not_hold_the_conch
Fixes One Crew Member Law
2017-11-27 15:37:23 -06:00
Cyantime
209b354fd4 Allows communicators to be made by RnD, shows ghosts communicator IMs 2017-11-27 00:33:49 -05:00
Anewbe
17244aec13 You can now put people and borgs in rechargers 2017-11-26 19:37:56 -06:00
Anewbe
99a0c6cd67 Corrects a compile error 2017-11-26 18:13:34 -06:00
Anewbe
1591fdcc81 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into radiation_tweaks
# Conflicts:
#	code/game/objects/items/devices/defib.dm
2017-11-26 17:53:00 -06:00
Neerti
a414fc0453 Pleases Travis hopefully. 2017-11-26 15:26:17 -05:00