cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 01:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,536 Commits 9 Branches 0 Tags
dac673181c89776738588ffd64b51cdc32aa259b
Commit Graph

32963 Commits

Author SHA1 Message Date
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
Repede
927dd94cc5 Merge pull request #120 from gozulio/master 
R-UST Engine and Guide rework
Yolo
 2018-06-16 14:40:35 -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
f58492b1bf Merge pull request #119 from Repede/self 
Fix for blueshield (maybe) + adding Harpsong's vest (Needs added to fluff)
 2018-06-16 11:19:19 -04:00
Repede
5f078f9678 Harpsong fluff fix 2018-06-16 11:18:20 -04:00
Aronai Sieyes
62b5386eb3 Merge pull request #3890 from VOREStation/upstream-merge-5337 
[MIRROR] Folders props, and adds the laser prism, receptor, and sealed doors.
 2018-06-16 10:51:29 -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
b61604ffb0 Merge pull request #3868 from Mewchild/MC-Cargo 
Adds Eguns back to Cargo
 2018-06-16 10:51:05 -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
Michael Gosselin
4b4e3503f8 R-UST Engine and Guide rework 
Rewrote R-UST guide to actually match common R-UTS setup on yawn.
Replaced R-UST chamber floor with Airless floor.
Added a blast door Shroud for the R-UST, Does not block radiation
effectively yet.
added more Borosilicate glass around the engine monitering room and
reactor core.
Mapped special "High Density Borosilicate Glass" that blocks a lot of
radiation.
Removed pointless "Radiation Collector blast doors" button tht does
nothing.
 2018-06-16 04:44:07 -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
3c35b7d13a Folders props, and adds the laser prism, receptor, and sealed doors. (#5337) 
* Re-bases props, and adds the laser prism.

* Ver 1 of Puzzle Lock and Doors

* Doors

* Fix door hiccup I made, modify Prism
 2018-06-15 21:42:19 -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
Hawk_v3
15403798d8 Fixed missing backsprites 
Forgot about those. I simply renamed the tanks as the old one was removed anyway. Apologies.
 2018-06-15 22:49:38 +01:00
Hawk_v3
1db1280651 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:46:14 +01:00
Hawk_v3
bd6c3a6102 Merge remote-tracking branch 'upstream/master' 2018-06-15 22:41:50 +01:00
Hawk_v3
e698051d94 Fixed missing back sprite. 
So yeah, I forgot to change the back sprite name. Might as well just make the tanks match the back sprites since I removed the old ones.
 2018-06-15 22:40:41 +01: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
Repede
367b8f978a Merge pull request #117 from Repede/self 
Fixes blueshield not having access
 2018-06-15 08:52:33 -04:00
Repede
5d6e883966 Fixes blueshield not having access 2018-06-15 08:50:06 -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
Repede
6854657745 Merge pull request #116 from Repede/self 
Adds shotgun shells to Blueshield locker
 2018-06-14 20:35:31 -04:00
Repede
469f2c7b22 Adds shotgun shells to Blueshield locker 2018-06-14 20:33:54 -04:00
Repede
27e243a0fa Merge pull request #115 from Repede/self 
Makes blueshield less snowflake
 2018-06-14 20:13:14 -04:00
Repede
420c8a2159 Makes blueshield less snowflake 
- fixes title to 'Blueshield Guard'.
 - closet has a shotgun with beanbags instead of a X01 custom fluff weapon.
 2018-06-14 19:54:27 -04: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