cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-28 07:38:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
35,653 Commits 7 Branches 1 Tag
3633a787e2735ce5af866b4d95cf5baefadcf66b
Commit Graph
35653 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnewbeandGitHub 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
AnewbeandGitHub 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
NeertiandGitHub bdcc33519f Merge pull request #4370 from Anewbe/check_new_players 
Readds the check_new_players admin verb
 2017-11-28 19:12:57 -05:00
Anewbe b07ac2e6fa Readds the check_new_players admin verb 2017-11-28 17:42:35 -06:00
MechoidandGitHub ff14ac236f Merge pull request #4356 from Anewbe/winter_boots 
Winter coats cover legs, winter boots do not
 2017-11-28 14:20:21 -08:00
BelsimaandAnewbe 34f076cbe7 Parrot adjustments. (#4350) 
* Parrot adjustments.

* Adds galactic common to languages.

* Update parrot.dm

* Update parrot.dm

* fixes
 2017-11-28 14:50:55 -06:00
NeertiandGitHub 034d5391d7 Merge pull request #4364 from Anewbe/rollerbed_fix 
Fixes rollerbed sprites
 2017-11-28 02:06:52 -05:00
Neerti a66482de75 Adds a Wild Slime type for future surface-things. 2017-11-28 02:05:37 -05:00
Anewbe adcb39b727 Fixes rollerbed sprites 2017-11-28 00:10:00 -06:00
NeertiandGitHub 667931ae2d Merge pull request #4338 from Belsima/signs 
Adds signs.
 2017-11-27 20:22:24 -05:00
BelsimaandAnewbe 2d3a306dea Loadout additions + fixes. (#4339) 
* Loadout additions + fixes.

* Selection fix.
 2017-11-27 19:21:49 -06:00
NeertiandGitHub 6060f99ee0 Merge pull request #4340 from Belsima/orthodoxy 
Bible additions.
 2017-11-27 20:20:42 -05:00
NeertiandGitHub 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
MechoidandGitHub c505b7883f Merge pull request #4329 from Anewbe/synthblood 
Creates synthblood reagent, adds it to merc medic borg hyposprays
 2017-11-27 16:15:35 -08:00
mistyLuminescenceandAnewbe e4ff301c01 Advanced Roller Bed (#4319) 
* Adds the advanced rollerbed to R&D

* default surgery rate

* finally
 2017-11-27 16:40:52 -06:00
BelsimaandAnewbe b44924b156 Boop! (#4348) 
* Cleanbot sounds.

* Floorbot sounds.

* grammer

* Update floorbot.dm
 2017-11-27 15:38:00 -06:00
AnewbeandGitHub 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
MechoidandGitHub 2f5ddf618f Merge pull request #4358 from Anewbe/skrell_sprites 
Touches up Skrell sprites
 2017-11-27 13:34:27 -08:00
MechoidandGitHub c46ed7b28b Merge pull request #4355 from Anewbe/losebreath 
Adds a cap to losebreath
 2017-11-27 13:34:00 -08:00
Cyantime cdb859ff34 Mobs can't push objects that they can't pull. 2017-11-27 14:44:09 -05:00
AnewbeandGitHub 9da6ddb7e5 Merge pull request #4359 from PolarisSS13/revert-4345-revert-4301-revert-4292-NOV17MAP_TEST 
Revert "Revert "Revert "Switches us to the Southern Cross for testing"""
 2017-11-27 09:28:07 -06:00
AnewbeandGitHub 45a8fd2eda Revert "Revert "Revert "Switches us to the Southern Cross for testing""" 2017-11-27 09:16:28 -06:00
Anewbe cf0612a67d Touches up Skrell sprites 2017-11-27 01:03:02 -06:00
Cyantime 209b354fd4 Allows communicators to be made by RnD, shows ghosts communicator IMs 2017-11-27 00:33:49 -05:00
Anewbe 1d73ff684c Winter coats cover legs, winter boots do not 2017-11-26 22:01:42 -06:00
Anewbe 1d9af61ff0 Adds a cap to losebreath 2017-11-26 21:55:55 -06:00
NeertiandGitHub 63a62a2739 Merge pull request #4351 from Anewbe/blizzard_fix 
Makes blizzards less cold
 2017-11-26 18:00:36 -05:00
Anewbe ab574554d5 Makes blizzards less cold 2017-11-26 16:34:28 -06:00
NeertiandGitHub 1e5421767c Merge pull request #4345 from PolarisSS13/revert-4301-revert-4292-NOV17MAP_TEST 
Revert "Revert "Switches us to the Southern Cross for testing""
 2017-11-26 17:20:10 -05:00
AnewbeandGitHub 1d28553c6b Merge pull request #4349 from PolarisSS13/11/26/2017_quickfix 
Corrects block chance on alien armor.
 2017-11-26 16:09:00 -06:00
NeertiandGitHub 2de2391f3c Corrects block chance on alien armor. 2017-11-26 16:01:15 -05:00
AnewbeandGitHub c9f92a9716 Merge pull request #4347 from Neerti/11/26/2017_ufo_poi 
Adds Challenging UFO PoI
 2017-11-26 14:52:12 -06:00
NeertiandGitHub dd72fe162c Merge pull request #4346 from ThoughtSynapsis/TS_Master_POI2 
Additional POI's, Just in time for testing!
 2017-11-26 15:48:17 -05:00
Neerti a414fc0453 Pleases Travis hopefully. 2017-11-26 15:26:17 -05:00
ThoughtSynapsis 479091e520 Add's POI's to test_map listing. 2017-11-26 15:25:35 -05:00
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
ThoughtSynapsis 2221263d1b Additional POI's, Just in time for testing! 2017-11-26 14:59:25 -05:00
AnewbeandGitHub 667ad2feee Revert "Revert "Switches us to the Southern Cross for testing"" 2017-11-26 13:20:21 -06:00
AnewbeandGitHub a763b8a9dc Merge pull request #4343 from Woodratt/11262017_SC_Mapchaos 
Southern Cross Map Updates
 2017-11-26 13:08:37 -06:00
AnewbeandGitHub 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
Woodratt 37f77acea0 Southern Cross Map Updates 
- Fix for maint doors going invisible with repairs
- Multiple map updates and fixes (Not using the map merger after the stupidity of it breaking things last time
- Turned off dynamic lighting in turbolifts. It's only temporary, unless it works
- Tweaks to the surface maps in order to get them to blend in better with the surface areas and the caves. Fix for the cave ones so the ore gen doesn't run over top of them.
- Fixes for the station, including but not limited to attempting to update the floor decals, though they're only halfway done.
 2017-11-26 02:00:13 -08:00
AnewbeandGitHub cbfc351d9a Merge pull request #4342 from Neerti/11/26/2017_cracked_pls_go 
Removes Cracked Asteroids from Sif Mountains
 2017-11-26 03:09:38 -06:00
Neerti 3dfa7edb34 Removes Cracked Asteroids from Sif Mountains 
Hackfix but it works fairly well.
 2017-11-26 03:57:56 -05:00
NeertiandGitHub 7d0b3ffd20 Merge pull request #4332 from Cyantime/shapeshifterhair 
Adds hair color changing ability for prometheans.
 2017-11-26 01:27:12 -05:00
ThoughtSynapsisandNeerti 78fe20d58b Added new POI's. (#4221) 
* A handful of POI's and changes to Caves/Forest_Areas to accommodate the new POI's.

* Modified forest.dm to accept addition POI's. Fixed some issues in MCamp1.dmm regarding tiling.

* Adds missing syntax in .dm files.

* Adds additional POI, I swear I fixed the Syntax this time.

* Add .dmm to a few needed files syntax's.

* Fixes another few missing syntax issues.

* Another attempt at properly coding and setting the Syntax right.

* I hope I got I actually got the Syntax right this time.

* Thought is an Idiot, Changes checked files in Polaris.dme

* Attempting to fix some merge conflicts.

* Attempts to solve map turf conflicts and a few other issues.

* Replaces certain turfs in mudpit.dmm
 2017-11-26 01:23:50 -05:00
AnewbeandGitHub d524d721b9 Merge pull request #4335 from Neerti/11/22/2017_explorer_gear 
Adds Exploration Equipment
 2017-11-25 14:39:12 -06:00