Commit Graph

29217 Commits

Author SHA1 Message Date
Atermonera
ccf99996af Merge pull request #5724 from Heroman3003/washingmachine-noise
Added washing machine working sound
2018-12-11 13:46:00 -08:00
kevinz000
e0fdeeceff line endings 2018-12-10 21:28:07 -08:00
kevinz000
33a2375ed4 line endings 2018-12-10 21:27:49 -08:00
kevinz000
a96240d74e fixes 2018-12-10 21:22:45 -08:00
kevinz000
90e3dd4cc8 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2018-12-10 15:54:00 -08:00
Neerti
2c4b5af14a Merge pull request #5677 from kevinz000/PS_PORT_SCHEDULER
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2018-12-10 15:28:19 -05:00
kevinz000
8ee0adff8f compile 2018-12-10 04:18:48 -08:00
atermonera
a0c8891eb6 Refactors poi rotation to use degrees instead of dir
Fixes powernet rotation being totally non-functional
2018-12-09 22:56:45 -08:00
Neerti
364018d451 Merge pull request #5767 from Heroman3003/typo-heater
Fixed a typo in Space Heater's cell removal message
2018-12-09 23:47:34 -05:00
kevinz000
ab3f30b28f Merge remote-tracking branch 'polaris/master' into PS_PORT_SCHEDULER 2018-12-09 20:34:39 -08:00
atermonera
b8c9bb6c31 Standardizes rotation verbs 2018-12-08 21:27:10 -08:00
Anewbe
cfeab054f6 Fixes a compile error with the Initialize() proc 2018-12-08 19:29:21 -06: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
Heroman3003
6fb2e87974 Fixed a typo in Space Heater's cell removal message 2018-12-09 06:56:16 +10: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
fba5b39cab fix 2018-12-07 04:59:06 -08: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
Mechoid
6cf28ffc66 Optimize 2018-12-02 15:01:55 -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
a6b168f950 Merge pull request #5643 from lbnesquik/Kates-Mech-Tweaks
Mech noises update.
2018-11-30 21:35:10 -08:00
Atermonera
bffcafb557 Merge pull request #5649 from lbnesquik/Kates-Flashlight-F
ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
2018-11-30 21:32:30 -08:00
Atermonera
420ddf330b Merge pull request #5742 from Nalarac/patch-3
Changes Mech Diamond Drill Cooldown
2018-11-30 21:31:38 -08:00
kevinz000
aa6f232b87 Adds logging to special world reboots, admins with debug access can now reboot while world is OOM'd (#5737)
* Update world.dm
2018-11-30 21:30:00 -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
ddb55ca361 Merge pull request #5715 from Mechoid/Service_Fab_Updoot
Updates Rapid Service Fabricators.
2018-11-30 21:16:17 -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