cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-05 14:10:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,287 Commits 16 Branches 0 Tags
2b0aff0b6d9bcba6da4ba44b83516e0443fbb708
Commit Graph

21437 Commits

Author SHA1 Message Date
Repede
2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self 
# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm
 2018-06-23 17:53:13 -04:00
Aronai Sieyes
65ddf25028 Merge pull request #3892 from VOREStation/upstream-merge-5355 
[MIRROR] Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter
 2018-06-20 13:40:07 -04:00
Aronai Sieyes
016166672a Merge pull request #3894 from VOREStation/upstream-merge-5356 
[MIRROR] Recharger refactor
 2018-06-17 19:24:16 -04:00
Aronai Sieyes
19c6b0f6ba Merge pull request #3896 from VOREStation/upstream-merge-5276 
[MIRROR] More Phase Guns
 2018-06-17 16:22:53 -04:00
Aronai Sieyes
852bfb83c7 Merge pull request #3899 from VOREStation/upstream-merge-5360 
[MIRROR] Adds aura style modifier code
 2018-06-17 16:21:06 -04:00
Atermonera
0f171aa97a Merge pull request #5360 from Anewbe/aura_modifier 
Adds aura style modifier code
 2018-06-17 15:59:01 -04:00
Atermonera
cc161d7624 Merge pull request #5359 from Anewbe/arc_projectiles 
Adds arcing projectiles
 2018-06-17 15:58:50 -04:00
Anewbe
97c32f35f1 More Phase Guns 2018-06-17 13:35:54 -04:00
Aronai Sieyes
c36e062931 Merge pull request #3879 from VOREStation/upstream-merge-5349 
[MIRROR] Clothing Bug Fixes
 2018-06-16 22:44:16 -04:00
Aronai Sieyes
c06339487a Merge branch 'master' into upstream-merge-5335 2018-06-16 17:43:55 -04:00
Atermonera
fe94038e7a Recharger refactor 2018-06-16 17:15:59 -04:00
Aronai Sieyes
dfcdcc9630 Merge pull request #3891 from VOREStation/upstream-merge-5350 
[MIRROR] Weather is shorter, hail is less deadly.
 2018-06-16 15:35:56 -04:00
Aronai Sieyes
679263f355 Merge pull request #3893 from VOREStation/upstream-merge-5357 
[MIRROR] Use SSoverlays please
 2018-06-16 15:35:47 -04:00
Arokha Sieyes
44bf1b8736 More biomass for the noms purposes 2018-06-16 14:45:18 -04:00
Arokha Sieyes
7312120662 Fix resleeving UI, make compatible 2018-06-16 14:39:55 -04:00
Aronai Sieyes
9fc0b7dabd Fix merge conflicts 2018-06-16 14:10:02 -04:00
Atermonera
d482eac947 Weather is shorter, hail is less deadly. 2018-06-16 14:02:09 -04:00
Aronai Sieyes
c6fae09c1d Merge pull request #3888 from VOREStation/upstream-merge-5322 
[MIRROR] Move planets to SSplanets
 2018-06-16 13:57:09 -04:00
Anewbe
455377f6ff Use SSoverlays please 2018-06-16 13:42:55 -04:00
Anewbe
a0ffc104bf Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter 2018-06-16 13:41:40 -04:00
Repede
5f078f9678 Harpsong fluff fix 2018-06-16 11:18:20 -04:00
Aronai Sieyes
abd67bb983 Merge pull request #3889 from VOREStation/upstream-merge-5282 
[MIRROR] Allows AIs to produce and control maint/construction/mining drones.
 2018-06-16 10:51:20 -04:00
Aronai Sieyes
dd504699e0 Merge pull request #3875 from Little-119/MSTA 
Makes synths able to taste again
 2018-06-16 10:47:37 -04:00
Arokha Sieyes
7c050dd35c Fix merge conflict, update virgo planet things 2018-06-16 10:43:45 -04:00
Repede
41ec39ab59 Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff list) 2018-06-15 23:39:13 -04:00
Aronai Sieyes
c973d4ce69 Fix merge conflict (probably) 
Not sure if this is the best fix for this, really.
 2018-06-15 21:53:55 -04:00
Mechoid
9b00166de0 Allows AIs to produce and control maint/construction/mining drones. (#5282) 
* Allows AIs to control maint/construction drones.

* Radio control online.

* Things Not Saving

* Drone control respects intellicores.

* Config control, AI drones are disableable if the AI isn't an antag.

* There's a diff so it must have saved. Right?

* No un/wrenching of the core.

* Complies to Replies.
 2018-06-15 20:15:03 -04:00
Anewbe
98b3af60fa Move planets to SSplanets 2018-06-15 19:05:38 -04:00
Aronai Sieyes
c81757bcf9 Merge pull request #3880 from Verkister/vsedits 
Couple VS edit fixes.
 2018-06-15 09:12:30 -04:00
Aronai Sieyes
049ea78975 Merge pull request #3877 from VOREStation/upstream-merge-5352 
[MIRROR] Adds a "cancel" option to the Drop-Bomb admin verb.
 2018-06-15 09:11:27 -04:00
Aronai Sieyes
97822d8d7a Merge pull request #3876 from VOREStation/upstream-merge-5351 
[MIRROR] Fixes "glass of cup of coffee"
 2018-06-15 09:08:34 -04:00
Aronai Sieyes
a5b5f8e59d Merge pull request #3856 from VOREStation/upstream-merge-5183 
[MIRROR] Robolimb brand damage tweaks, makes VeyMed more fragile
 2018-06-15 09:06:18 -04:00
Aronai Sieyes
f3ab493437 Merge pull request #3863 from Verkister/transflavor 
Makes belly transfers update contamination.
 2018-06-15 09:02:56 -04:00
Aronai Sieyes
fce19d4326 Merge pull request #3861 from VOREStation/upstream-merge-5343 
[MIRROR] prevent slimes from spawning on top of people
 2018-06-15 09:02:28 -04:00
Aronai Sieyes
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff 
Vietsi Fluff Items
 2018-06-15 09:00:26 -04:00
Aronai Sieyes
9522612c98 Merge pull request #3834 from granodd/sprites 
More Ear Sprites
 2018-06-15 08:57:41 -04:00
Aronai Sieyes
a162c86d51 Merge pull request #3855 from VOREStation/upstream-merge-5341 
[MIRROR] Wires are under catwalks, fueltanks are over floor decals
 2018-06-15 08:57:22 -04:00
Aronai Sieyes
abbaf84ce7 Merge pull request #3854 from VOREStation/upstream-merge-5339 
[MIRROR] Change-Eye-Color verb should work again
 2018-06-15 08:57:08 -04:00
Aronai Sieyes
02baa415f6 Remove Veymed portion of change for weakness 2018-06-15 08:55:20 -04:00
Verkister
ac94d82ba1 Couple VS edit fixes. 
-Fixes borg sleepers nuking passengers on cryo despawn.
-Fixes mimics dropping their guts.
 2018-06-15 10:24:39 +03:00
Anewbe
4d696241fa Merge pull request #5349 from Woodratt/WR6112018_clothingfix 
Clothing Bug Fixes
 2018-06-14 10:54:14 -04:00
Anewbe
536c3e3394 Merge pull request #5352 from MagmaRam/balm 
Adds a "cancel" option to the Drop-Bomb admin verb.
 2018-06-13 22:48:33 -04:00
Anewbe
0479b08b82 Merge pull request #5351 from MagmaRam/coffee 
Fixes "glass of cup of coffee"
 2018-06-13 22:48:21 -04:00
Spades
6f30b149cd Merge pull request #3351 from Screemonster/greenfingers 
alraune species
 2018-06-13 18:33:07 -04:00
Little-119
fa2da1ead6 Makes synths able to taste again 
Comments out the code added by commit 04ea07fb02

Since Aronai said he made synths able to taste a year ago, and synths not being able to taste was a goof
 2018-06-13 16:30:49 -04:00
Repede
3c07607014 Fixes to map branch to allow blueshield job in 2018-06-13 00:22:19 -04:00
Spades
29ad5aa5df Merge pull request #3860 from VOREStation/upstream-merge-5344 
[MIRROR] Sky is not a 'skiy'
 2018-06-12 21:26:33 -04:00
Arokha Sieyes
c60738b330 Enforce minimum age limit across all characters 
Synths could be any age.
 2018-06-12 20:14:03 -04:00
Atermonera
7cd1442e8f Ports some Bay hair code 2018-06-12 03:43:57 -04:00
Verkister
2c4a123f43 Makes belly transfers update contamination. 
-Transfers from itemweak belly to another now reset the contamination according to the target gut's settings.
 2018-06-12 10:21:02 +03:00