cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 00:51:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,957 Commits 2 Branches 1 Tag
2f07a8901524f3bf82f110f3325e70ea7243ff15
Commit Graph

17860 Commits

Author SHA1 Message Date
Neerti
b60c9097e8 Uncomments a thing. 2018-12-12 20:31:54 -05:00
Neerti
60115154f7 Stops initialization from grinding to a halt when loading maps. 2018-12-12 20:10:23 -05:00
Neerti
6db306c537 Merge pull request #5775 from Atermonera/startup_runtimes 
Startup runtimes
 2018-12-11 22:21:38 -05:00
atermonera
ba2f500bc5 Fixes #5712: error handler and decl runtimes 2018-12-11 15:23:33 -08:00
kevinz000
ab3f30b28f Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-09 20:34:39 -08:00
Atermonera
61df5b880b Merge pull request #5762 from kevinz000/initialize_caps 
Capitalizes initialize() to Initialize() because Destroy() is capitalized
 2018-12-08 15:44:41 -08:00
Anewbe
acd9d1b330 Merge pull request #5746 from elgeonmb/loreupdateepsilon 
Adds like 4 million articles.
 2018-12-07 20:03:17 -06:00
Neerti
452fd9afb8 Adds several new map/event oriented objects (#5757) 
* Adds some helpful effects to enhance PoI construction.

* Adds several features for mappers.

* Test map please go
 2018-12-07 17:48:09 -06:00
Neerti
5e2d8bbdee Merge pull request #5756 from Anewbe/mob_ai_fixes 
Fixes a few AI bugs
 2018-12-07 12:43:59 -05:00
kevinz000
c2c688c4c8 caps 2018-12-06 18:34:37 -08:00
kevinz000
d15f7efa5b Merge branch 'master' into PS_PORT_SCHEDULER 2018-12-06 18:10:48 -08:00
Atermonera
8f946a39b4 Merge pull request #5760 from Anewbe/bioacid 
Adds BIOACID damage type
 2018-12-06 13:19:05 -08:00
Atermonera
6a3f46a946 Merge pull request #5758 from Neerti/post_merge_ai_fixes 
Fixes several bugs with AI mobs
 2018-12-06 13:18:02 -08:00
Cerebulon
799ba7cd99 Adds 12 new futuristic loadout clothing items + colour variants (#5744) 
* Adds 12 new loadout clothing items + colour variants
 2018-12-06 13:16:36 -08:00
kevinz000
8da11c17a2 Makes math helpers defines for performance (#5654) 2018-12-06 13:13:59 -08:00
kevinz000
70a934adf9 compiles 2018-12-06 10:32:25 -08:00
kevinz000
a52c341861 Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-06 10:20:46 -08:00
Anewbe
ec57465a5c Merge pull request #5748 from Neerti/submap_orientation_config 
Adds ability to selectively disable submap rotation.
 2018-12-05 16:15:52 -06:00
Anewbe
4b7bc616df Adds BIOACID damage type 2018-12-05 01:41:42 -06:00
Neerti
d3527b5cc5 Cleanup I forgot to do 2018-12-04 19:11:29 -05:00
Neerti
ac5fdfcd9e Fixes several bugs with AI mobs 2018-12-04 19:00:21 -05:00
Anewbe
08665794e0 Merge pull request #5747 from Neerti/fulltile_window_improvements 
Makes fulltile windows seperate from dir
 2018-12-04 13:36:18 -06:00
Atermonera
05e9daec52 Merge pull request #5714 from Mechoid/The_story_so_far_In_the_beginning_the_grippers_were_created_This_has_made_a_lot_of_people_very_angry_and_was_widely_regarded_as_a_bad_move 
Borg, Gripper, and Integrated Circuit interaction update.
 2018-12-03 17:21:43 -08:00
Atermonera
414cf71cfa Merge pull request #5726 from kevinz000/ss_refactor_3 
Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed
 2018-12-03 17:21:00 -08:00
Atermonera
927311ca22 Merge pull request #5723 from Mechoid/PrometheanTweakening_The_Agonizing_One 
Promethean Regen tweaks. (The one with the devil's deal.)
 2018-12-03 17:20:35 -08:00
Anewbe
e8053e264f Fixes a few AI bugs 2018-12-03 16:44:53 -06:00
Mechoid
31596cb4bd Tweak so it doesn't Permastun. Just makes it really easy to. 2018-12-02 17:02:43 -08:00
Neerti
07ad88b590 Adds ability to selectively disable submap rotation. 2018-12-01 07:40:47 -05:00
Neerti
3779ea54a7 Makes fulltile windows seperate from dir. 2018-12-01 07:39:13 -05:00
elgeonmb
6c15933433 adds like 4 million articles 
my hands are so sore
 2018-12-01 01:04:42 -08:00
Atermonera
c6b8fb332d Merge pull request #5713 from Novacat/spriteadd 
Fixes personal ownership of cats
 2018-11-30 21:38:54 -08:00
Atermonera
23cd3e8d5e Merge pull request #5736 from SpadesNeil/pistol-ammo-fixes 
Fixes missing hollow point ammo for 9mm
 2018-11-30 21:27:20 -08:00
Atermonera
c14282d9f8 Merge pull request #5718 from kartagrafi/hairunderwearwhatever 
New hair + underwear
 2018-11-30 21:16:58 -08:00
Atermonera
3155d5829f Merge pull request #5735 from Neerti/hopefully_last_master_sync 
Merges AI Branch into Master
 2018-11-30 21:05:42 -08:00
Neerti
0cf536b7de Addresses Ater's things. 2018-11-28 03:44:13 -05:00
Anewbe
e009d5ec41 Merge pull request #5730 from Nalarac/patch-2 
Adds Autolathe Cost to Knuckledusters
 2018-11-09 21:04:46 -06:00
Kates
ae85355106 Remplace pills made by the condimaster with bouillon cubes. (#5689) 
* Remplace pills made by the condimaster with bouillon cubes.
Just a couple lines remplace so the condimaster can create pills which look like bouillon cubes (monkey cubes)
The .DMI change is just me adding the monkey cube sprite with a different name. It was fair easier than to have the template look into another file for the icon.

* Remove duplicates

* Fix names being redundant

* Add a description for ze pill.
 2018-11-09 21:02:37 -06:00
Anewbe
b0064dcb66 Merge pull request #5706 from VOREStation/aro-hail 
Hail tweaks
 2018-11-09 21:02:05 -06:00
Spades
82a9aca463 Wrong category. Moved to correct location. 2018-11-09 19:44:53 -05:00
Spades
002f14a6eb Fixes missing hollow point ammo for 9mm 
9mm didn't have HP ammo for some reason, which is dumb, considering HP
ammo makes 9mm not useless while not being overpowered as hell.

All I did was add in the missing projectiles and relevant casings. How
they get implimented if at all is up to another PR.

Also made some notes for later because apparently Polaris is in a
feature freeze so I am not pushing new features, just fixing a missing
one, but I need to remind myself to do this later or remind somebody
else if I forget.
 2018-11-09 19:37:15 -05:00
Neerti
c2426020ce Fixes map and messed up living_defines. 2018-11-02 21:20:59 -04:00
Neerti
35aab759be Fixes conflicts yet again. 2018-11-02 21:09:56 -04:00
Andrew
46f94981a4 Adds Autolathe Cost to Knuckledusters 
The matter cost is the same as the tactical knife (500 steel which translates to 625 steel in an autolathe without upgrades.
 2018-11-02 10:05:39 -05:00
Neerti
0a949b2d88 Every damn time. 2018-10-31 18:20:23 -04:00
Neerti
0524390434 Fixes shantak den PoI. 2018-10-31 17:57:56 -04:00
Neerti
508b051716 Fixes loads of AI bugs. 2018-10-31 17:43:10 -04:00
kevinz000
f385dac926 stuff 2018-10-30 18:20:13 -07:00
Neerti
c696d9b468 Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix 
Update silicon manifest to discord dark theme.
 2018-10-30 18:41:47 -04:00
Neerti
cd628f1909 Merge pull request #5698 from Mechoid/Blood_For_The_Blood_Promethean 
Prometheans can process blood without exploding.
 2018-10-30 18:40:35 -04:00
Neerti
1052263ae4 Merge pull request #5705 from VOREStation/aro-bwoink 
Fix adminhelp sound toggle respect
 2018-10-30 18:38:05 -04:00