cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,562 Commits 10 Branches 0 Tags
40b1a56bdcde452282b64e01dac92c81b85a2c33
Commit Graph

32299 Commits

Author SHA1 Message Date
Aronai Sieyes
40b1a56bdc Revert "Revert "Upgrades Planetary Weather to vis_contents (#5170)"" 2018-06-01 20:35:28 -04:00
Aronai Sieyes
e04212d616 Merge pull request #3763 from Ketrai/master 
Adds Fennix mob
 2018-06-01 10:49:02 -04:00
Aronai Sieyes
2e8bfbc588 Merge pull request #3807 from VOREStation/upstream-merge-5314 
[MIRROR] Fix surgery breaking bones when performed correctly
 2018-06-01 10:00:49 -04:00
Aronai Sieyes
de202ea2e1 Merge pull request #3806 from VOREStation/upstream-merge-5318 
[MIRROR] Fixed xenoarch multitool being unmakeable
 2018-06-01 10:00:39 -04:00
Aronai Sieyes
4141fc0b42 Merge pull request #3805 from VOREStation/upstream-merge-5313 
[MIRROR] Move character join log statement
 2018-06-01 10:00:29 -04:00
Anewbe
a751fbb3ee Merge pull request #5314 from VOREStation/pol-encasedfracture 
Fix surgery breaking bones when performed correctly
 2018-05-31 22:06:59 -04:00
Anewbe
007bccc2ef Merge pull request #5318 from Heroman3003/xenoarch-multitool-fix 
Fixed xenoarch multitool being unmakeable
 2018-05-31 21:34:44 -04:00
Anewbe
25a6fb865a Merge pull request #5313 from VOREStation/pol-joblogmove 
Move character join log statement
 2018-05-31 21:33:31 -04:00
Anewbe
2fba824a89 Merge pull request #5310 from Heroman3003/arcade-fix 
Fixed arcades dispensing their own board
 2018-05-31 21:33:20 -04:00
Novacat
5addac95ed Pathfinder Update (#3777) 
* Pathfinder Update

- Implimented Pathfinder, Command Exploration role
- Added Deluxe Machete for Pathfinders (just a cosmetic reskin)
- Added Pathfinder's office, between expedition prep and breifing
- Expanded size of expedition shuttle
- Ported Pilot and Explorer voidsuit from Baystation
- Restored the old air tank on the expedition shuttle
- Added a couple starter shelter capsules to exploration
- The expedition shuttle now has toggled blast doors to cover the windows
- Increases pay of pilots, SARs, and Explorers
- Adds box of volunteer headsets to the Pathfinder's locker

* Polaris Merge Compatability

* Forgot some things

* Moves PF from command to science

* Requested changes Part 1

* Travis and Access Fix

* Requested changes Part 2

* Resetting Maps Part 1

* Resetting Maps Part 2

* Replaces PF office airlock

* Requested Changes Part 3

* Remove gateway access

* Changes Locker/Door Access Req

* Removes blast doors

* Pilot voidsuit crate cost tweak
 2018-05-31 16:57:40 -04:00
Aronai Sieyes
3973ad2630 Merge pull request #3801 from VOREStation/upstream-merge-5289 
[MIRROR] Prometheans can now be revived as originally intended.
 2018-05-31 13:11:13 -04:00
Aronai Sieyes
1c46d7e501 Merge pull request #3750 from fludd12/splat 
Prometheans melt on death.
 2018-05-31 13:11:02 -04:00
Aronai Sieyes
d96f4de071 Merge pull request #3775 from Novacat/nova-heterochromia 
Adds Heterochromia Marking
 2018-05-31 13:08:12 -04:00
fludd12
dc2b20c7c9 Removes brain_vr, as upstream merged the same code. 2018-05-31 00:27:58 -04:00
Mechoid
07e8ee1f50 Merge pull request #5289 from fludd12/splat 
Prometheans can now be revived as originally intended.
 2018-05-30 21:14:14 -04:00
Aronai Sieyes
f0f03c1d6d Merge pull request #3788 from VOREStation/aro-issue-3787 
Makes dogborgs spawn with bellies again
 2018-05-30 02:59:09 -04:00
Arokha Sieyes
4ff48da96a SYNC: Map changes for lighting 2018-05-30 00:56:12 -04:00
Arokha Sieyes
c0c091ed4a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-29-2018 
# Conflicts:
#	code/modules/power/lighting.dm
#	icons/turf/walls.dmi
 2018-05-29 21:05:27 -04:00
Spades
792fe93b81 Merge pull request #3785 from VOREStation/aro-ratfixes 
Rat code cleanup
 2018-05-29 20:10:41 -04:00
Aronai Sieyes
b2ede8367d Merge pull request #3793 from VOREStation/upstream-merge-5309 
[MIRROR] Fixed fruit salad not being make-able
 2018-05-29 14:51:40 -04:00
Anewbe
978fdd2842 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 14:35:57 -04:00
Anewbe
65051fe83b Rewrite mine turf overlay adding 2018-05-29 14:35:45 -04:00
Anewbe
d308cb4563 Merge pull request #5269 from deathride58/fancylighting 
Makes lighting a little fancier, reduces the amount of light sources with a power greater than 1
 2018-05-29 13:33:27 -05:00
Anewbe
9fad848847 Merge pull request #5308 from VOREStation/pol-mineoverlays 
Rewrite mine turf overlay adding
 2018-05-29 13:32:39 -05:00
Anewbe
fe65dd22a4 Merge pull request #5309 from Heroman3003/melon-fix 
Fixed fruit salad not being make-able
 2018-05-29 13:32:21 -05:00
Anewbe
66ceb6862a Merge pull request #5311 from VOREStation/pol-proxghosts 
Fixes #5083
 2018-05-29 13:31:57 -05:00
Arokha Sieyes
309a28911a Makes dogborgs spawn with bellies again 
Fixes #3787
 2018-05-28 21:02:58 -04:00
Aronai Sieyes
15acf6d79d Merge pull request #3780 from VOREStation/aro-exppermit 
Corrects explorer permit language
 2018-05-28 20:59:33 -04:00
Aronai Sieyes
e1176af1fe Merge pull request #3783 from VOREStation/upstream-merge-5307 
[MIRROR] Split and clarify global lists of processing vs non-processing machinery.
 2018-05-28 20:59:11 -04:00
Aronai Sieyes
d4d4bf17f7 Merge pull request #3782 from VOREStation/upstream-merge-5306 
[MIRROR] Move space/New to space/initialize
 2018-05-28 20:58:59 -04:00
Spades
310dcd4d0d Grammar! 2018-05-28 19:26:56 -04:00
Arokha Sieyes
8fdb1d3191 Rat code cleanup 
Fixes a compile warning and some other things (reduces view range, and how often they scan to be more like Ian)
 2018-05-28 17:35:50 -04:00
Aronai Sieyes
304c8b6f6f Merge pull request #3779 from Novacat/MiscTweaks 
Fixes Machete Sheaths
 2018-05-28 17:12:36 -04:00
Leshana
d430448ebf Split and clarify global lists of processing vs non-processing machinery. (#5307) 
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
 2018-05-28 15:57:02 -04:00
Leshana
30f10be83e Split and clarify global lists of processing vs non-processing machinery. (#5307) 
* Renaming local var 'machines' to avoid confusion with the global var of same name.

* Delete the unused process scheduler machinery.dm file.  Long since replaced with SSmachines

* Split and clarify global lists of processing vs non-processing machinery.

- Renamed the list of processing machinery from "machines" to "processing_machines"
- Added new global list "machines" to be a list of all machines.
- Since nearly every reference to machines actually wanted to iterate over all machines anyway, this works out great.
 2018-05-28 12:56:49 -07:00
Atermonera
5c4bde965a Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms 
Reverse use of global lists where they hurt performance.
 2018-05-28 15:55:55 -04:00
Atermonera
2ba143a332 Merge pull request #5306 from VOREStation/aro-spaceinit 
Move space/New to space/initialize
 2018-05-28 15:50:39 -04:00
Atermonera
1a42238ac3 Merge pull request #5306 from VOREStation/aro-spaceinit 
Move space/New to space/initialize
 2018-05-28 12:50:05 -07:00
Arokha Sieyes
0d434fadab Corrects explorer permit language 
Permit doesn't let them carry guns "on the surface", it lets them carry guns while exploring.
 2018-05-28 14:47:07 -04:00
Unknown
8572125d57 Fixes Machete Sheaths 
- Machete sheath now has proper slot assignment, so it can be worn again.
 2018-05-28 12:41:34 -04:00
Verkister
1222e5d0d6 Merge branch 'master' into hangryrat 2018-05-28 15:08:53 +03:00
Arokha Sieyes
0283074785 Fixes #5083 
This whole HasProximity() thing should be redone at some point. We discovered earlier that every atom moving into every turf notifies every atom/movable in the surrounding 8 turfs that it's now moved into the turf. Which is silly. There's like 4 things that use the system, including prox sensors.
 2018-05-27 21:40:45 -04:00
Aronai Sieyes
c5ded806f1 Merge pull request #3765 from VOREStation/aro-prottypefix 
Fix prototype trait showing up
 2018-05-27 21:21:22 -04:00
Arokha Sieyes
b96aec1e52 SYNC: Missed another closet (typo) 2018-05-27 19:53:45 -04:00
Arokha Sieyes
1437123502 SYNC: Missed one 2018-05-27 19:43:39 -04:00
Arokha Sieyes
8f8c41a7c1 SYNC: Correct vorestation closets/crates to use new system 2018-05-27 19:33:34 -04:00
Heroman3003
2f0d9aab04 Fixed watermelon not having kitchen_tag 2018-05-28 09:33:10 +10:00
Arokha Sieyes
2d89d63c09 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018 
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/l3closet.dm
#	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
#	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
#	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
#	maps/southern_cross/structures/closets/misc.dm
#	maps/submaps/surface_submaps/wilderness/DoomP.dmm
#	vorestation.dme
 2018-05-27 19:26:12 -04:00
Unknown
c02a0973ff Adds Heterochromia Markings 
Supports most species, with exception of Teshari, Skrell, and Vox.
 2018-05-27 18:40:04 -04:00
Aronai Sieyes
4cddf6ccd0 Merge pull request #3762 from VOREStation/aro-sync-05-25-2018 
Polaris Sync 05/25/2018
 2018-05-27 18:38:44 -04:00