cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 14:33:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,782 Commits 7 Branches 0 Tags
ae755b776cc4b17de1bcf2ebc95a2a8d884bf1b4
Commit Graph

32446 Commits

Author SHA1 Message Date
Arokha Sieyes
ae755b776c Remove the custom Virgo version of siiktajr 2018-07-02 00:21:41 -04:00
Anewbe
8b813107c1 Merge pull request #5361 from Novacat/spriteadd 
Ports Siik'Tajr from Baystation
 2018-06-29 15:49:56 -04:00
Aronai Sieyes
8e870dc58a Merge pull request #3946 from Verkister/accerrorize 
Adds a bunch of new sprite accessories.
 2018-06-29 09:41:33 -04:00
Spades
04ad5eadab Merge pull request #3939 from CameronWoof/first-aid-kits 
Updates first aid kit sprites
 2018-06-29 09:12:50 -04:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03:00
Aronai Sieyes
ed8767ce72 Merge pull request #3925 from Verkister/spicyboye 
Adds "redspace" oties.
 2018-06-28 14:34:49 -04:00
Aronai Sieyes
a082cd2a34 Merge pull request #3935 from VOREStation/upstream-merge-5374 
[MIRROR] Gloves cannot be put over Commwatches.
 2018-06-28 14:33:55 -04:00
Cameron!
f44fe108a1 in which we discover the importance of proper quotation 
and apologize profusely to Travis for the inconvenience
 2018-06-27 11:29:23 -04:00
Cameron!
66c8325e48 properly comments the clotting kit change 2018-06-27 11:09:44 -04:00
Cameron!
b44d87b744 Gives clotting kits a unique sprite 
Adds a unique sprite for clotting kits
 2018-06-27 11:08:15 -04:00
Aronai Sieyes
e74f784791 Merge pull request #3937 from Mewchild/MC-Permits 
Permit Cleaning
 2018-06-27 11:07:02 -04:00
Cameron!
89dcfa7c52 Updates first aid kit sprites 
So pretty.
 2018-06-27 10:50:56 -04:00
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00
Mewchild
26753c4330 Seb still has a permit. Misread. 2018-06-26 00:45:03 -05:00
Mewchild
f4ce27804c Comments out a bunch of expired permits and associated weapons 2018-06-25 23:52:25 -05:00
Anewbe
13567cb681 Merge pull request #5373 from VOREStation/pol-podfix 
Fix invalid logic in clonepod beaker function
 2018-06-25 20:39:41 -04:00
Anewbe
ef482a0d5d Merge pull request #5374 from Mechoid/Commwatchbug 
Gloves cannot be put over Commwatches.
 2018-06-25 20:39:29 -04:00
Verkister
d1ab58b7f8 Little tweaks etc. 
-Renamed heckboy paths.
-Fixed a sprite inconsistency.
-New latin names.
-Feral red changed to cult faction.
-Changed red tame chance to 20%.
-Made "experimental environment" otie crate have a 20% chance to contain a friendly red instead of phoron.
 2018-06-25 11:33:19 +03:00
Arokha Sieyes
ed726ecfbc Biomass change compensation 2018-06-24 15:25:36 -04:00
Verkister
49e7cb1bcd Adds "redspace" oties. 
-Stats-wise identical to phoron mutants for now.
-Can appear in dangerous pred crate.
-Commissioned for shenanigans etc.
 2018-06-24 16:34:24 +03:00
Aronai Sieyes
859b06497b Merge pull request #3874 from Novacat/nova-pathfinder 
Ports Siik'Tajr from Baystation
 2018-06-24 01:02:52 -04:00
Aronai Sieyes
47dac5ae08 Merge pull request #3895 from Verkister/chompybois 
Gives simplemobs and dogborgs brutal predation
 2018-06-24 00:59:55 -04:00
Aronai Sieyes
19b20c6e84 Merge pull request #3907 from Wickedtemp/patch-2 
Slight cloning mlem
 2018-06-24 00:58:33 -04:00
Aronai Sieyes
9a9541d848 Merge pull request #3904 from Sharkmare/patch-2 
Making Circuit debugger fit in toolbelt
 2018-06-24 00:58:23 -04:00
Aronai Sieyes
2434ed0b44 Merge pull request #3903 from Sharkmare/patch-1 
Adding the Bioadaptive NIF to designs_vr.dm
 2018-06-24 00:58:14 -04:00
Aronai Sieyes
10fafd79a2 Merge pull request #3900 from VOREStation/rust-voresettings 
Use rust-g to optimize saving of vore persistent settings if available.
 2018-06-24 00:58:05 -04:00
Aronai Sieyes
42f6ffef04 Merge pull request #3913 from VOREStation/upstream-merge-5365 
[MIRROR] Alien Cable Coil Fix
 2018-06-23 22:01:36 -04:00
Cameron653
ef2c62c63a Alien Cable Coil Fix (#5365) 
* Prevents the infinite cable coil alien tool from making more infinite cable coil tools.

* Prevents you from going over the 30 cap.

* Tochat
 2018-06-21 03:26:14 -04:00
Mechoid
382ce457ca Fix AI-drone runtimes. Get angry at commits. (#5366) 
* 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.

* Fix some AI-drone runtimes.
 2018-06-21 03:19:27 -04:00
Wickedtemp
24f31e6ed0 Secondary Clonemlem 
Because I left out //MLEMstation Edit
 2018-06-20 13:08:11 -05:00
Wickedtemp
00904e6c98 Slight cloning mlem 
Halves biomass required for printing a body. 60, to 30.
 2018-06-20 12:53:17 -05: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
Sharkmare
2cbfb05a4a Making Circuit debugger fit in toolbelt 
Because both the multitool and the Circuit wirer fit in already.
 2018-06-20 03:39:09 +02:00
Sharkmare
5af4c44e78 Adding the Bioadaptive NIF to designs_vr.dm 
Added the Bioadaptive NIF to the list of Designs using the sort code of the NIF repair tool and gave the NIF repair tool a new sortcode.
 2018-06-19 14:59:23 +02:00
Verkister
472672a834 reset module thing 2018-06-18 18:17:58 +03:00
Aronai Sieyes
016166672a Merge pull request #3894 from VOREStation/upstream-merge-5356 
[MIRROR] Recharger refactor
 2018-06-17 19:24:16 -04:00
Leshana
c377a4a6c0 Use rust-g to optimize saving of vore persistent settings if available. 2018-06-17 19:11:17 -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
Aronai Sieyes
f255bb2b5c Merge pull request #3898 from VOREStation/upstream-merge-5359 
[MIRROR] Adds arcing projectiles
 2018-06-17 16:20:48 -04:00
Arokha Sieyes
261627e44f Fix merge conflict 2018-06-17 16:19:13 -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
Atermonera
e1e967eac6 Merge pull request #5358 from Anewbe/turret_faction 
Backports turret faction code
 2018-06-17 15:57:37 -04:00
Anewbe
97c32f35f1 More Phase Guns 2018-06-17 13:35:54 -04:00
Verkister
de50347dfd Gives simplemobs and dogborgs brutal predation 
All these chompy bois around but only humans and pAIs are allowed to bite smh.
 2018-06-17 15:00:07 +03: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