cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-28 11:03:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,134 Commits 7 Branches 0 Tags
f772d7622cf690e6623786aecd0538069626e4e3
Commit Graph

21353 Commits

Author SHA1 Message Date
Repede
f772d7622c Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	config/custom_items.txt
 2018-06-10 21:19:07 -04:00
Repede
9422dec67d Dabs on the proteans, hopefully. 2018-06-10 19:04:48 -04:00
Repede
8cc1047023 Lots of new markings and stuff 2018-06-08 21:24:32 -04:00
Cameron653
5db710c434 Merge pull request #3817 from ArgobargSoup/master 
Adds Lynn Shady's personalized penlight
 2018-06-08 19:49:22 -04:00
Repede
90ce7b203a compile fix 2018-06-06 20:29:26 -04:00
Repede
c0ea30d5ba Readded fatty taurs, 
Added Harpsongs new centtaur sprite
 2018-06-06 19:52:48 -04:00
Aronai Sieyes
3106baef73 Merge pull request #3833 from VOREStation/upstream-merge-5326 
[MIRROR] Ion Rifle returned to original radius.
 2018-06-04 17:28:07 -04:00
Aronai Sieyes
632300ceeb Merge pull request #3831 from VOREStation/upstream-merge-5327 
[MIRROR] Changes "Setup Character" to "Character Setup"
 2018-06-04 17:27:47 -04:00
Aronai Sieyes
f88524ca61 Merge pull request #3824 from VOREStation/upstream-merge-5319 
[MIRROR] Adds two new sets of robolimbs
 2018-06-04 17:27:32 -04:00
Mechoid
6e99a135e3 Ion Rifle returned to original radius. (#5326) 
* Return ion rifles to their intended 3x3 rather than 5x5.

* Changelog
 2018-06-04 16:13:45 -04:00
Anewbe
d755dfd2b8 Merge pull request #5327 from Cameron653/patch-2 
Changes "Setup Character" to "Character Setup"
 2018-06-04 16:08:13 -04:00
Repede
b47d74979a new janidoggo sprite - Harpsong 2018-06-03 16:30:24 -04:00
Atermonera
76c8e20e2a Merge pull request #5301 from Anewbe/more_merc_mob_things 
Adds armor to certain mobs, mercs have knives
 2018-06-03 03:58:47 -04:00
Repede
7ff5b60680 Modkit needed for RD rig (Sheri) 2018-06-02 19:38:59 -04:00
Aronai Sieyes
b0f21a938b Merge pull request #3822 from VOREStation/upstream-merge-5305 
[MIRROR] Prevent autosay() from creating/deleting AIs
 2018-06-02 19:03:02 -04:00
Repede
b83e867682 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/power/lighting.dm
 2018-06-02 18:33:44 -04:00
Repede
3f7dd29745 Seromi can be older 2018-06-02 18:26:28 -04:00
Anewbe
fad161aeb7 Merge pull request #5319 from SubberTheFabulous/LoveBranded 
Adds two new sets of robolimbs
 2018-06-02 16:22:56 -04:00
Anewbe
7528ac54fb Merge pull request #5305 from VOREStation/pol-autosay 
Prevent autosay() from creating/deleting AIs
 2018-06-02 12:47:27 -04:00
pontifexminimus2
3ea860ae99 Typo 
Oops, that doesn't belong there...
 2018-06-02 18:32:42 +02:00
pontifex2
2f3fa81425 Assorted Zorren changes to make them in line with the lore I set up. 
Changed their blood colour to a blue.
Replaced their native language Siik (?? This is the Tajaran language) with Terminus, a Polaris language currently whitelisted.
Disabled the whitelist for Terminus.
Changed the description for Terminus so it's actually the Zorren's language.
 2018-06-02 18:28:44 +02:00
ArgobargSoup
8111652e25 Update custom_items_vr.dm 2018-06-02 03:03:27 -07:00
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
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
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
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