cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 05:52:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,018 Commits 7 Branches 0 Tags
f5fb89cb3d239c075df0259eb47b83cd8f05cf7a
Commit Graph

21225 Commits

Author SHA1 Message Date
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
91edca4434 Recharger refactor 2018-06-14 15:37:22 -05:00
Anewbe
4d696241fa Merge pull request #5349 from Woodratt/WR6112018_clothingfix 
Clothing Bug Fixes
 2018-06-14 10:54:14 -04:00
Anewbe
8b6377016f Merge pull request #5349 from Woodratt/WR6112018_clothingfix 
Clothing Bug Fixes
 2018-06-14 09:53:19 -05: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
Anewbe
88555dc5f0 Merge pull request #5351 from MagmaRam/coffee 
Fixes "glass of cup of coffee"
 2018-06-13 21:47:40 -05: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
Unknown
c691ad5b8d Ports Siik'Tajr from Baystation 
Tail Sign language!
 2018-06-13 02:13:31 -04:00
MagmaRam
52367a96c2 Adds a "cancel" option to the Drop-Bomb admin verb. 2018-06-12 22:28:36 -05:00
MagmaRam
9c5492fd00 glass of cup of coffee begone 2018-06-12 21:51:10 -05: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
Atermonera
e8020dec9d Merge pull request #5335 from Anewbe/hair_stealing 
Ports some Bay hair code
 2018-06-12 00:43:43 -07: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
Woodratt
344cb191a5 Clothing Bug Fixes 
- Fix for duster on mob sprite
- Fix for striped swimsuit the on mob sprite
- Fix for hairpin on mob sprites
- Moved Riot and EMT spacesuit sprites to the proper dmi
- Moved combat rig sprite to the proper dmi
- Added a new gasmask (ported from Vorestation). Gasmask with a clear faceplate. Not added anywhere in the playing field
- Radiation hood now will not have hair clip through
 2018-06-11 15:22:13 -07: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
Layne
b4c1722bd6 Sky is not a 'skiy' (#5344) 
* Clandestine (Original Commit)

* Revert "Clandestine (Original Commit)"

This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27.

* the skiy
 2018-06-11 13:10:40 -05:00
Anewbe
87929b51d0 Merge pull request #5343 from ReddeyfishVor/slimeChanges 
prevent slimes from spawning on top of people
 2018-06-11 13:10:24 -05: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
Anewbe
58cca27282 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 17:48:04 -07: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
6f5491de67 Merge pull request #5341 from Anewbe/catwalks_again 
Wires are under catwalks, fueltanks are over floor decals
 2018-06-10 12:41:06 -07: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
Atermonera
e7ea5b1c69 Merge pull request #5339 from Anewbe/eye_color 
Change-Eye-Color verb should work again
 2018-06-10 12:38:58 -07:00
Reddeyfish
0a616af465 prevent slimes from spawning on top of people 2018-06-10 11:42:42 -07: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
456a1aa37e Merge pull request #5333 from Anewbe/mining_turf_tweak 
Mining turf overlays should be properly placed now
 2018-06-09 12:42:10 -07:00
Anewbe
05fa92c489 Wires are under catwalks, fueltanks are over floor decals 2018-06-09 13:26:30 -05: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
Anewbe
a8be0c1c82 Change-Eye-Color verb should work again 2018-06-08 18:54:49 -05: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
17a295b579 Ports some Bay hair code 2018-06-06 20:20:23 -05:00
Anewbe
7d23980df4 Mining turf overlays should be properly placed now 2018-06-06 18:09:07 -05:00
Anewbe
8144628015 Merge pull request #5331 from Mechoid/SmallAnomalistFixes 
Fix #5316 and #5220
 2018-06-06 18:50:45 -04:00