cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-17 21:52:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,922 Commits 5 Branches 1 Tag
fe32372f74d01227bf00017fc133233b51f9ce75
Commit Graph

26120 Commits

Author SHA1 Message Date
Anewbe
dd177bc96a Adds a spider spawner grenade, and variant. 2017-09-22 17:23:21 -05:00
Anewbe
c80b535a29 Merge pull request #3902 from Neerti/9/19/2017_lost_drone 
Adds the Lost Drone
 2017-09-22 15:24:05 -05:00
Belsima
cf20b8e3dd Slime scanner sprite. 2017-09-22 14:38:59 -04:00
Belsima
dcacb2182a Replaces vox sprites. 2017-09-22 14:29:30 -04:00
Anewbe
40075a319a Merge pull request #3806 from ghost/woodbuck 
Adds wooden buckets, craftable with botany.
 2017-09-22 12:20:29 -05:00
Neerti
e703d629c6 Fixes the Sun/Weather and Ports Vore's Lighting SS 
New lighting system is needed to handle updating literally 14k+ tiles whenever the sun moves.  The straight port seems to have had no adverse effects from what I could see.  Don't know if it's more performant but it doesn't seem to be less.

I didn't expect the latter would be needed for the former.
 2017-09-22 12:16:21 -04:00
Belsima
7e3dc535e2 Lets you pet pAIs on help intent. (#3874) 
* Allows you to pet pAIs.

* user.name, not user

* minor fix
 2017-09-22 01:21:38 -05:00
Anewbe
6d11df2754 Cryotoxin should no longer be as fast or powerful 2017-09-22 00:58:32 -05:00
Neerti
52c2eaac69 Placates Travis 2017-09-22 01:45:48 -04:00
Neerti
afd7b15442 Adds the Lost Drone 2017-09-22 01:17:53 -04:00
Neerti
cb222cafbf Merge pull request #3894 from Anewbe/splints 
Fixes splints for crisis borgs
 2017-09-22 00:58:58 -04:00
Neerti
50562f79cf Merge pull request #3886 from Anewbe/more_promethean_fixes 
Merc Prommies should be able to wear their space suits.
 2017-09-22 00:58:21 -04:00
Neerti
98a4158fa7 Merge pull request #3884 from Anewbe/condensation_sceptre 
Condensation can now freeze floors, if you have the scepter.
 2017-09-22 00:57:16 -04:00
Neerti
3bce4ed285 Merge pull request #3893 from Anewbe/bioprinter 
Improves the bioprinter
 2017-09-21 00:58:41 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack 
Adds a metric assload of sounds.
 2017-09-20 22:20:17 -05:00
Belsima
c67865ac63 Adds a load of new FBPs. (#3850) 
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
 2017-09-20 22:02:18 -05:00
Anewbe
0b83e020af Better borg tools, improves Electric Welder 2017-09-20 21:48:15 -05:00
Belsima
1c2c5833f9 Adds a bunch of dreams. (#3888) 
* Adds a bunch of dreams.

* fix

* maintaining connection

* capitalism
 2017-09-20 13:51:14 -05:00
Anewbe
d279c188c9 Adds the enchancement_desc 2017-09-20 13:10:06 -05:00
Belsima
b95828d8e8 Changes Tradeband syllables. (#3879) 
* Replaces tradeband syllables.

* fuck i didnt indent

* Adds syllables from latin.
 2017-09-20 12:57:11 -05:00
Anewbe
1431ac5148 Merge pull request #3891 from MisterLayne/9/19/2017_Rainbow_Slime_Fix 
Rainbow Slime Fix
 2017-09-20 12:11:01 -05:00
Anewbe
69e9906d75 Adds an endless cable coil to the alien toolbelt 2017-09-20 00:26:41 -05:00
Neerti
afaa029b2b Merge pull request #3875 from Anewbe/frost_spider 
Adds the Frost Spider. Starts support for more complicated spiderlings.
 2017-09-20 00:18:10 -04:00
Spades
32c79939b6 More merging updates 2017-09-19 23:58:40 -04:00
Spades
85df3ba3dc Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into Ace-infuriates-Anewbe-with-another-vintage-weapon 
# Conflicts:
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
 2017-09-19 23:58:06 -04:00
Anewbe
da75136b23 Fixes splints for crisis borgs 2017-09-19 21:40:02 -05:00
Anewbe
b633d35104 Merge pull request #3880 from Belsima/pro-lathe 
Xenoarch adjustments.
 2017-09-19 21:04:48 -05:00
Anewbe
d3cf04dbef Merge pull request #3878 from Belsima/oopsmygoopiscaptainagain 
The default for if your job is unavailable is assistant.
 2017-09-19 21:00:48 -05:00
Anewbe
9fe2ba0743 Merge pull request #3863 from Belsima/master 
Adds sounds to opening/closing firelocks.
 2017-09-19 21:00:10 -05:00
Anewbe
e01cbf4f02 Merge pull request #3861 from Belsima/hair 
Adds a bunch of new hair styles.
 2017-09-19 20:59:08 -05:00
Anewbe
0c200a312b Merge pull request #3828 from Belsima/xenospritz 
Replaces xeno sprites with cooler and darker ones.
 2017-09-19 20:56:53 -05:00
Anewbe
3beca956a0 Improves the bioprinter 2017-09-19 20:18:13 -05:00
MisterLayne
5580d29ae6 Changes Skrell Color Language 2017-09-19 21:00:44 -04:00
MisterLayne
cfdb777a13 Fixes Rainbow Slime Antagonism 2017-09-19 20:57:11 -04:00
Neerti
992101bbf4 Merge pull request #3868 from Anewbe/gamemaster_part_one 
Adds an event_manager chat channel
 2017-09-19 18:21:55 -04:00
Neerti
6311e663a1 Merge pull request #3882 from Anewbe/ghost_rune_chat 
Should let ghosts see communicate rune chat again.
 2017-09-19 03:27:40 -04:00
Anewbe
79581c5341 Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port 
Ports Trashpiles
 2017-09-19 01:26:20 -05:00
Anewbe
ba353abb7f Merc Prommies should be able to wear their space suits. 2017-09-18 19:49:53 -05:00
Anewbe
a8c9b61b75 Condensation can now freeze floors, if you have the scepter. 2017-09-18 16:34:21 -05:00
Anewbe
fb3b5864b6 Space Lube dries off eventually 2017-09-18 14:31:07 -05:00
Anewbe
649ca6d53a Should let ghosts see communicate rune chat again. 2017-09-18 14:03:46 -05:00
Anewbe
1894dc7060 Merge pull request #3857 from Neerti/9/17/2017_slime_update 
Slime Update
 2017-09-18 11:49:22 -05:00
Anewbe
1ff1eb5e88 Merge pull request #3825 from Neerti/9/12/2017_fire_unbugged 
Makes Fire Hot Again
 2017-09-18 11:22:04 -05:00
Anewbe
4b201ca6ec Merge pull request #3845 from Woodratt/09162017_RailingsnCatwalks 
Catwalks and Railings
 2017-09-18 11:10:15 -05:00
Mechoid
17dfae4020 Tweaks Xenomorph spitting. (#3852) 
* Tweaks Xenomorph spitting.

* Swap 'them' for 'the target'. ..Also fixes the mismatched costs.

* Swaps 'them' for 'the target'. Also, in-progress fixing phoron costs of acid.

* Fixes the acid phoron cost. Because Git wasn't playing nice. AAAAAAA.

* Swaps a long line out for a small check.
 2017-09-18 11:03:04 -05:00
Belsima
e94e375cd5 Adds nicotine to cigarettes. (#3856) 
* Adds nicotine to cigarettes.

* Fixes pathing.

* Adjusts the volume of nicotine added.

* satisfies the lord travis

* Better way of adding nicotine to cigs.
 2017-09-18 11:02:51 -05:00
Belsima
69b09d859b Xenoarch adjustments. 2017-09-18 11:15:14 -04:00
Belsima
18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Neerti
1c264176d9 Ports Trashpiles 
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
 2017-09-18 06:34:10 -04:00
Neerti
835148250c Comments out fire spreading pending discussion in the future. Hopefully. 2017-09-18 04:48:43 -04:00