Commit Graph

28634 Commits

Author SHA1 Message Date
kevinz000
0bed005cda fix 2018-12-23 19:59:21 -08:00
kevinz000
e408250296 Merge remote-tracking branch 'polaris/master' into pixel_projectiles 2018-12-23 11:31:48 -08:00
kevinz000
a4b2b7c871 stuff 2018-12-23 02:34:45 -08:00
Atermonera
cd00518c2a Merge pull request #5792 from Neerti/christmas_stuff
Ports the lightpost and present tree from tg.
2018-12-22 13:55:49 -08:00
Neerti
7210ad49ac Ports the lightpost and present tree from tg. 2018-12-20 22:10:46 -05:00
kevinz000
57fb18301c Speeds up getFlatIcon (#5765)
* GetFlatIcon speedup

* profiling

* uhh

* Woohoo!
2018-12-20 19:09:46 -08:00
Neerti
192c61d34a Merge pull request #5786 from avabee/patch-4
Fixes issue #5788.
2018-12-18 21:28:43 -05:00
Naidh
aeaddc58fa Removes "allowed_roles" from Cloaks (#5783)
Department ponchos had this same line removed back in February as part of #4843 - now, the same is (hopefully) being done for cloaks.
2018-12-18 18:18:50 -08:00
avabee
7e92904386 QDEL_NULL, fixes #5788. 2018-12-18 20:17:18 -06:00
avabee
c2c04c18a5 Fixes a bug with holographic projectors.
Would not properly null out the variable, meaning it just waits to be garbage collected. Bad. Very bad.
2018-12-16 22:37:26 -06:00
Mechoid
a428fad5e8 Event / Future PoI / Other weaponry & tools. (#5764)
* Starts work on New gear

* Solidify New Gear Post-Testing

* Fix non-meter energy weapons not using their normal power supply.

* Fixfix
2018-12-15 20:11:10 -08:00
Neerti
68d3406898 Merge pull request #5773 from Neerti/identification_system
Adds Identification System, New Autoinjectors
2018-12-14 21:06:06 -06:00
Anewbe
d5b0840feb Merge pull request #5777 from Heroman3003/laptop-refix
Fixes laptops blocking people properly.
2018-12-13 22:19:47 -06:00
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
Heroman3003
87c3b73dc6 Fixes laptops blocking in proper way 2018-12-13 10:21:41 +10:00
Neerti
6db306c537 Merge pull request #5775 from Atermonera/startup_runtimes
Startup runtimes
2018-12-11 22:21:38 -05:00
atermonera
2c400a8edd Fixes #5538
Fixes mucus attempting to randomize a list of viruses instead of the first virus in the list
2018-12-11 15:50:03 -08:00
atermonera
ba2f500bc5 Fixes #5712: error handler and decl runtimes 2018-12-11 15:23:33 -08:00
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
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
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