cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-23 08:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,509 Commits 2 Branches 1 Tag
948d43afecadc272b215ec2e8c46f30a901b5c18
Commit Graph

15532 Commits

Author SHA1 Message Date
Neerti
140cbfd279 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 11/26/2017_ufo_poi 
# Conflicts:
#	maps/submaps/cave_submaps/cave.dm
 2017-11-26 15:13:35 -05:00
Neerti
01aaccf893 Finishes UFO PoI 2017-11-26 15:10:25 -05:00
Anewbe
247642057d Merge pull request #4337 from Belsima/vendors 
Various vending fixes.
 2017-11-26 13:04:37 -06:00
MisterLayne
ab83bb90be One Crew Member 2017-11-26 12:28:59 -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
Belsima
6b784accfd Bible additions. 2017-11-24 21:01:33 -05:00
Belsima
e425a3bd21 what if COmpile 2017-11-24 20:48:06 -05:00
Belsima
27a6fa9e7b Adds signs. 2017-11-24 20:34:42 -05:00
Belsima
42627cbc76 Various vending fixes. 2017-11-24 20:29:32 -05: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
Anewbe
2b63d97add Merge pull request #4320 from Neerti/11/21/2017_submap_system 
Adds Submap (PoI) Seeding Procedure
 2017-11-22 18:53:25 -06: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
Mechoid
7c0a92cb3c Merge pull request #4317 from Anewbe/hacked_borg 
Hacked borgs can no longer be locked down
 2017-11-22 16:13:54 -08: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
Mechoid
c59d426413 Merge pull request #4323 from PolarisSS13/revert-4288-blubois 
Revert "Various vendor fixes + use of unused sprites."
 2017-11-21 23:23:54 -08: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
Anewbe
51dc3dca93 Revert "Various vendor fixes + use of unused sprites." 2017-11-22 01:02:16 -06:00
Anewbe
1997cc34ce Merge pull request #4288 from Belsima/blubois 
Various vendor fixes + use of unused sprites.
 2017-11-22 01:02:13 -06:00
Anewbe
fc33c09a22 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hacked_borg 2017-11-21 23:20:15 -06:00
Anewbe
17a5b70d38 Hacked borgs can no longer be locked down 2017-11-21 23:19:57 -06:00
Neerti
fe33977812 Adds Submap (PoI) Seeding Procedure 
Mostly ports /tg/'s method of seeding submaps into specific z-levels.
Due to the low number of submaps present, all of the PoIs are guaranteed to spawn. As more are added, this should fix itself.
 2017-11-21 19:21:39 -05:00
Layne
6bdadd58e8 fuck 'usr <<' (#4245) 2017-11-21 15:22:05 -06:00
Mechoid
d5404ae0eb Adds More Spiders. Touches cuff-code tangentially. 2017-11-21 12:59:06 -08:00
Anewbe
ce16c391fa Merge pull request #4313 from PrismaticGynoid/storemoreplaces 
Increases maximum stored camera locations
 2017-11-21 13:31:54 -06:00
Neerti
99e48c9c51 Merge pull request #4281 from Belsima/ELLIS 
Adds a message to the IRC for round start.
 2017-11-21 01:33:33 -05:00
Neerti
cc616148e3 Merge pull request #4291 from mistyLuminescence/FisforFriendswhoDoStuffTogether 
Adds bracelets!
 2017-11-21 01:32:35 -05:00
Marina Gryphon
2489497f81 Maybe fixes #4220. 2017-11-20 18:42:05 -06:00
PrismaticGynoid
c15f908dde Increases maximum stored camera locations 
This increases the number of stored camera locations the AI can have at one time, from 10 to 30. This is mostly a quality-of-life update in preparation for the new map, as its multiple floors make navigating around the station as the AI more difficult.
 2017-11-20 12:22:22 -08: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
418dda15dc Merge pull request #4148 from mistyLuminescence/fbphud 
MedHUDs can identify FBPs
 2017-11-19 17:40:03 -06: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
3320690a1e I before E (#4287) 
* except after C

* maroonic mistake

* Improved use of sound files.

Also more grammar.

* now with less fuckup
 2017-11-19 03:00:14 -06:00
Neerti
9eeacdfb48 Merge pull request #4211 from Anewbe/ling-cuff-slip 
Adds a ling ability to slip cuffs
 2017-11-19 03:54:50 -05: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
Anewbe
61cb829dc1 Adds an actual icon for Escape Restraints 2017-11-19 02:34:40 -06:00
Anewbe
c043bc3f02 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into ling-cuff-slip 2017-11-19 01:58:06 -06:00
Woodratt
2684942049 Map fixes 
Multiple Map Issue Fixes
 2017-11-18 19:17:48 -08:00
Belsima
b7cb63f165 Some more grammar fixes for my dudes. 2017-11-18 14:24:24 -05:00
Anewbe
77db846f44 Merge pull request #4279 from Verkister/jobslot 
Fixes one player being able to hog every slot of a job alone.
 2017-11-18 12:03:28 -06:00