cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,676 Commits 8 Branches 0 Tags
15403798d87eb2e44c19b825db2c5827a697f466
Commit Graph

32374 Commits

Author SHA1 Message Date
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
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
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
Hawk_v3
9a3933517d Fix and Additions to Vox Tanks 
Fixed Vox double tanks spawning in internal boxes.
Added indicator to Vox back tank, shifted sprite two pixels to reuse double tank indicators.
Added strip to Vox emergency tank to bring in line with back and double tanks.
 2018-06-12 17:59:38 +01: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
6b55a44254 Merge pull request #3850 from VOREStation/upstream-merge-5336 
[MIRROR] Cult robes use the right sprite again
 2018-06-11 06:11:30 -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
a2f8abd12c Merge pull request #3841 from VOREStation/upstream-merge-5334 
[MIRROR] Ater forgot to remove debug code
 2018-06-11 06:08:49 -04:00
Aronai Sieyes
97465264c3 Merge pull request #3840 from VOREStation/upstream-merge-5323 
[MIRROR] Wallet money spawns as a bundle.
 2018-06-11 06:08:31 -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
Ketrai
c351f1d3b0 Adds a fennec crate to cargo. (#3810) 
* Adds a fennec crate.

Adds a fennec crate with a smaller chance of containing fennix.

* Adds a fennec crate

* Update hydroponics_vr.dm

* Fixes an error?

* Update largecrate_vr.dm

* Update largecrate_vr.dm
 2018-06-11 06:06:49 -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
Atermonera
876068eeda Merge pull request #5336 from Anewbe/cult_robe_sprite_fix 
Cult robes use the right sprite again
 2018-06-09 15:40:38 -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
178cffe6de Merge pull request #5334 from Atermonera/aters_a_donk_round2 
Ater forgot to remove debug code
 2018-06-06 20:37:32 -04:00
Atermonera
190dd08fc4 Merge pull request #5323 from Anewbe/loadsamoney 
Wallet money spawns as a bundle.
 2018-06-06 19:08:31 -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