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
43,692 Commits 7 Branches 0 Tags
44bf1b8736bc117acdb66d4737fcbb97bf627cf2
Commit Graph

21050 Commits

Author SHA1 Message Date
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
Anewbe
a0ffc104bf Bioprinters and Cloners now use Biomass reagent, maps in a Bioprinter 2018-06-16 13:41:40 -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
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
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
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
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
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
Anewbe
f1c5978a32 Merge pull request #5343 from ReddeyfishVor/slimeChanges 
prevent slimes from spawning on top of people
 2018-06-11 14:11:28 -04:00
Layne
01fddbbc02 Sky is not a 'skiy' (#5344) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* the skiy
 2018-06-11 14:11:16 -04:00
Mewchild
7960499bd2 Vietsi Fluff Items 2018-06-11 12:00:27 -05:00
Aronai Sieyes
d669d8a97f Merge pull request #3851 from VOREStation/upstream-merge-5333 
[MIRROR] Mining turf overlays should be properly placed now
 2018-06-11 06:12:24 -04:00
Aronai Sieyes
3ba9361c77 Merge pull request #3849 from deathride58/dispvoreprefs 
Adds a button to view the mechanical voreprefs of a mob when examining
 2018-06-11 06:11:20 -04:00
Aronai Sieyes
44500587f9 Merge pull request #3846 from Nepoox/master 
Adds Annie's pullover (Fluff Item)
 2018-06-11 06:10:38 -04:00
Aronai Sieyes
d8a7328dac Merge pull request #3839 from VOREStation/upstream-merge-5331 
[MIRROR] Fix #5316 and #5220
 2018-06-11 06:08:09 -04:00
Aronai Sieyes
6e1fd34d33 Merge pull request #3838 from VOREStation/upstream-merge-5330 
[MIRROR] Fix #5321
 2018-06-11 06:07:34 -04:00
Aronai Sieyes
884a4ec99c Merge pull request #3820 from Novacat/nova-pathfinder 
Pathfinder Fixes
 2018-06-11 06:04:42 -04:00
Anewbe
1d054fd29e Robolimb brand damage tweaks, makes VeyMed more fragile (#5183) 
* Robolimb brand damage tweaks, makes VeyMed more fragile

* Lessens VeyMed damage malus to 10%.
 2018-06-10 20:49:11 -04:00
Atermonera
d768871055 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 15:41:54 -04:00
Atermonera
f7d77629af Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 15:39:37 -04:00
Nepoox
8ff967eeec Changed name and description 2018-06-09 23:19:57 +02:00
Atermonera
aca81ab59c Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 15:42:55 -04:00
deathride58
7c55a4f817 don't code on 48 hours of sleep deprivation - fixes bolding in vorepref display, makes simpleanimal examine a little more compact 2018-06-09 07:41:52 -04:00
deathride58
d78a1ef8ed And here, too! the /human subtype completely overrides the /atom/movable examine() 2018-06-09 07:05:53 -04:00
deathride58
2118a4ce73 adds a button to view the mechanical vore prefs of a mob when examining 2018-06-09 07:00:44 -04:00
Nepoox
e1cbfac2bf Fluff Item 2018-06-09 02:50:41 +02:00
Cameron653
5db710c434 Merge pull request #3817 from ArgobargSoup/master 
Adds Lynn Shady's personalized penlight
 2018-06-08 19:49:22 -04:00
Anewbe
8144628015 Merge pull request #5331 from Mechoid/SmallAnomalistFixes 
Fix #5316 and #5220
 2018-06-06 18:50:45 -04:00
Anewbe
4cfabdc9a4 Merge pull request #5330 from Mechoid/SeedpocalypseTheFirst 
Fix #5321
 2018-06-06 18:50:34 -04:00
Granodd
350b6f5ea8 New sprites for Virgo. 2018-06-05 14:13:11 -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