Commit Graph

6553 Commits

Author SHA1 Message Date
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Neerti
5b0b639377 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi
# Conflicts resolved:
#	maps/submaps/cave_submaps/cave_areas.dm
2017-11-26 12:09:55 -05:00
Neerti
7497aef295 work 2017-11-26 12:08:05 -05:00
Anewbe
d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear
Adds Exploration Equipment
2017-11-25 14:39:12 -06:00
Neerti
8ac2100fa2 Adds Exploration Equipment
Ports and tweaks the Explorer gear from /tg/. Recolored to remove the mining purple, instead its now a nice blue because winter, I suppose.
Adds a new survival knife that is bootknife ready.
Replaces xenoarch GPS with budget /tg/ GPS that is more useful, as it can track other GPSes.
2017-11-24 07:22:35 -05:00
BillyBangles
f1280b234b Adds rotate verb for pianos (#4324)
* Adds rotate verb and directional piano sprites

* fixes ghost rotation

I forgot Polaris and Bay handle ghosts quite differently. This should fix that.

* mice and restrained people cannot rotate a piano

i can break these cuffs
2017-11-23 12:58:43 -06:00
Neerti
845eae4c65 Merge pull request #4322 from Anewbe/fuck_mosin
Removes the mosin-nagant, moves the sprites
2017-11-23 03:32:37 -05:00
Neerti
9db0451aee Merge pull request #4328 from Cyantime/patch-2
Tools used on railings now use their correct sounds
2017-11-22 19:24:43 -05:00
Cyantime
e85191acfd Tools used on railings now use their correct sounds 2017-11-22 18:38:30 -05:00
Cyantime
9ba6d5759a Fixes 'reques console' 2017-11-22 18:25:49 -05:00
Anewbe
6e3bbd31c0 Removes the mosin-nagant, moves the sprites 2017-11-22 01:14:14 -06:00
Anewbe
62d76cba30 Merge pull request #4318 from Mechoid/Mechoid_Has_The_Keys_And_A_Brick_On_The_Pedal
Adds more Spiders. Touches cuff-code tangentially.
2017-11-22 01:13:04 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Neerti
cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether
Adds bracelets!
2017-11-21 01:32:35 -05:00
Neerti
d36d09d937 Merge pull request #4176 from Anewbe/battery_things
Swaps non-mounted recharging guns to batteries
2017-11-19 21:28:06 -05:00
Anewbe
1fb2e32e2f Merge pull request #4297 from Neerti/11/18/2017_make_syndie_toolboxes_special_again
Makes Syndie Toolboxes Special Again
2017-11-19 17:25:44 -06:00
Neerti
d8b26358ce Merge pull request #4278 from Anewbe/defib_charge
Successful Defibs are more costly, chargewise.
2017-11-19 17:50:13 -05:00
Neerti
595f874f9b Merge pull request #4264 from Anewbe/decap_defib
Decapitation now stops defibrillation
2017-11-19 17:50:03 -05:00
Belsima
b72cc54580 Meatspike fixes. (#4299)
* Various fixes.

* Appeases the travis god by properly using isMonkey.

* Skips out on helpers entirely.

* Adds a parantheses.

I ruin commit histories just by glancing at them.
2017-11-19 14:42:37 -06:00
Belsima
594625cf81 Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280)
* Adds force to lamps.

* Standardization.

* Standardizes a few things.

* Grammar that I missed.

* Some more missed grammar.
2017-11-19 02:52:56 -06:00
Anewbe
4b9369971b Merge pull request #4275 from Cyantime/patch-1
Allows constructed full window to smooth with mapped windows
2017-11-19 02:51:48 -06:00
Anewbe
fd7990028f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into battery_things 2017-11-19 02:38:42 -06:00
Woodratt
2684942049 Map fixes
Multiple Map Issue Fixes
2017-11-18 19:17:48 -08:00
Anewbe
3d15d309fd Merge pull request #4286 from Nalarac/Morgue
Allows Cyborgs to Use Morgue Trays
2017-11-18 12:02:52 -06:00
Neerti
4263a9b70b Makes Syndie Toolboxes Special Again
The syndie toolboxes have been split into two versions, one with the old contents pre-powertools and one with the current powertools. Both are in the uplink, however only the regular tool version of the syndie toolbox can be found in maint now. This is to make power tools less commom, as there are several spots where syndie toolboxes are guaranteed to spawn at,  and it made the CE's tools less special.
2017-11-18 08:06:38 -05:00
Anewbe
98787bc2ef Merge pull request #4285 from mistyLuminescence/defibghost
Fixes ghost defib message bug
2017-11-17 20:12:57 -06:00
Andrew
4b422b71c0 Allows Cyborgs to Use Morgue Trays
+Adds attack_robot so cyborgs can use morgues
+Makes crematoriums a child of morgues
+Changes messages to use to_chat
2017-11-17 16:33:01 -06:00
Anewbe
9191bfe6f7 Adjusts original PR as per Staff request 2017-11-17 16:11:05 -06:00
Anewbe
2a55433ca9 Merge pull request #4276 from Neerti/11/16/2017_get_out_of_here_stalker
Tweaks Geiger Counters
2017-11-17 16:05:40 -06:00
Anewbe
d1d5ec3887 Merge pull request #4271 from Mechoid/Nano-Pasta
Nanopaste Tweaks
2017-11-17 15:59:14 -06:00
mistyLuminescence
3a19bf7c2b Fixes ghost defib message 2017-11-17 21:28:41 +00:00
Mechoid
fd287ec671 Nanopaste functions once more as an advanced damage kit for FBPs, ignoring the damage-limit of welders and cables. Now has a use-time for borgs and normal repair. 2017-11-17 11:44:07 -08:00
mistyLuminescence
0d9a175aac Adds bracelets! 2017-11-17 18:27:35 +00:00
Belsima
f9b90b98ed Standardization & grammar. 2017-11-17 13:18:32 -05:00
Anewbe
27f0f44222 Successful Defibs are more costly, chargewise. 2017-11-16 23:56:55 -06:00
Neerti
810f7e694d Tweaks Geiger Counters
Geiger counters now have sounds, which I took from https://freesound.org/people/leonelmail/sounds/328381/ and chopped it up into several .oggs. The license is CC0 (public domain) so it'll fit with our license.
The Geiger counter now turns yellow at any sign of radiation instead of at 5 units, since below five units is still harmful.
Examining the Geiger counter updates the radiation count immediately.
2017-11-16 18:13:29 -05:00
Cyantime
1fc2d5da04 Allows constructed full window to smooth with mapped windows 2017-11-16 16:49:22 -05:00
mistyLuminescence
0431c2d23c Changes the old hyposprays to the new hyposprays. (#4223)
* Hypospray mk1 -> Hypospray mk2

* Medical random spawns no longer have the new hypo.

* Medic syndiecrate now has the old hypo
2017-11-15 16:31:50 -06:00
Neerti
09105a55b7 Fixes Bandage Spam Exploit
Removes ability to circumvent bandage limits by spamclicking someone. The check if its already bandaged is done twice, once at the start and once after the delay.
Replaces a lot of user << with to_chat().
2017-11-14 22:32:45 -05:00
Anewbe
f5e831050b Decapitation now stops defibrillation 2017-11-14 01:15:29 -06:00
Mechoid
34eef27b7b Merge pull request #4215 from Anewbe/gym_equipment
Ports Bay's gym equipment
2017-11-10 18:47:49 -08:00
mistyLuminescence
9dad109f22 Putting wielded fire axes back now works correctly. 2017-11-06 10:27:55 +00:00
Sabess
c96781499f Allows detectives to take an optional revolver + some other stuff (#4217)
* I'm like 99% sure this works

* uhm

* accidentally broke something after I tested but before I PRed, fixed now
2017-11-05 22:53:11 -06:00
Anewbe
1126523497 Merge pull request #4202 from mistyLuminescence/mappingstuff
Chemist and Psychiatrist locker fixes, for real this time.
2017-11-05 20:08:34 -06:00
Anewbe
f1e939c397 Ports Bay's gym equipment 2017-11-04 18:53:18 -05:00
elgeonmb
8560a35ec3 fixed megaphone lore 2017-11-04 01:59:00 -07:00
Anewbe
7e62570129 Merge pull request #4205 from MisterLayne/LostDroneCharger
Lost Drone Pod Charger
2017-11-03 23:38:43 -05:00
mistyLuminescence
41f332df42 fuck this pr PART TWO 2017-11-04 00:00:07 +00:00
mistyLuminescence
a0c5ecb8d5 UPDATES IT FOR REAL THIS TIME 2017-11-03 23:29:14 +00:00
Anewbe
516b7e7c2d Merge pull request #4206 from Cyantime/windos
Minor window fixes
2017-11-03 16:11:27 -05:00