cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 8 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

10433 Commits

Author SHA1 Message Date
Novacat
d8c3d23e60 Merge pull request #5465 from VOREStation/upstream-merge-6272 
[MIRROR] Mining Expansion, the Diggening.
 2019-07-14 01:36:27 -04:00
TheFurryFeline
8c01080dba Nalarac's Farmbot Tweak (#6297) 
* Nalarac's Farmbot Tweak

Adding access_xenobiology to the permission levels for Farmbots so xenobotanists can make use of the bugger. Doing this on behalf of Nalarac, using work from  https://github.com/PolarisSS13/Polaris/pull/6288

* Revert "Nalarac's Farmbot Tweak"

This reverts commit bba618a39687574fd7b7fed463aa8f03ba4c5b4e.

* Test Comment Addition

* Back on Track

Restores reverted line and re-adds CL. This compiles FINE in everything BUT here. Think it's just Travis being buggy or something.
 2019-07-13 15:58:28 -04:00
Atermonera
9325f590ca Mining Expansion, the Diggening. 2019-07-13 03:48:38 -04:00
Atermonera
7aeab71140 Merge pull request #6286 from Mechoid/Glitterpatch 
Patches Glitterflies
 2019-07-12 02:50:16 -04:00
Atermonera
634b56b1d1 Merge pull request #6280 from Nalarac/patch-8 
Fixes Nurse Spider Feeding
 2019-07-11 23:56:43 -04:00
Heroman
c1cef80bf9 Changes lobby screen name to match server name 2019-07-06 06:34:15 +10:00
Spades
5a7bdcebf4 Merge pull request #5378 from Novacat/nova-survival 
Minor Fixes
 2019-07-05 07:04:18 -04:00
Spades
bb7b3fe9cc Merge pull request #5376 from mistyLuminescence/customsay 
Custom Say Verbs
 2019-07-05 07:03:50 -04:00
Anewbe
61a95813c2 Merge pull request #6254 from Heroman3003/farmbotfix 
Fixes farmbot infinite looping
 2019-07-03 13:11:22 -04:00
Anewbe
e223a8b4ad Merge pull request #6251 from Heroman3003/reactionfix 
Fixes retaliate mobs ignoring melee attacks
 2019-07-02 08:28:01 -04:00
Atermonera
02ea14d239 Merge pull request #6250 from Heroman3003/altclickup 
Allows to interact with turf itself in Turf tab
 2019-07-01 20:48:36 -04:00
Anewbe
d731589ba0 Merge pull request #6238 from Heroman3003/broken-components 
QoL improvements for broken components
 2019-06-29 04:08:30 -04:00
Anewbe
046f481825 Merge pull request #6231 from Heroman3003/ghostjumpfix 
Fixes ghost jump-to-mob
 2019-06-28 10:06:57 -04:00
Unknown
52c1d3a491 Minor Fixes 
- Fixes problems with Alraune Breathing
- Cleans up Subspace Radio code
 2019-06-26 22:38:54 -04:00
if there were two guys on the moon
bf3366c673 Vorestation edit 2019-06-26 19:24:31 +01:00
if there were two guys on the moon
e2b4317366 Custom Say Verbs 2019-06-26 18:52:36 +01:00
Heroman
3bc811dbc2 Returns solargrub stun 2019-06-25 15:04:43 +10:00
Novacat
960df85343 Update generic.dm 2019-06-24 16:11:46 -04:00
Atermonera
2064228917 Blindly adds partial cross-language intelligibility 2019-06-24 15:22:06 -04:00
Unknown
81732c03f6 Updates Ascian's Kitten 2019-06-21 17:50:11 -04:00
Novacat
c05d335d88 Update cat.dm 2019-06-21 17:40:35 -04:00
Novacat
a9db5212d2 Update cat.dm 2019-06-21 17:33:51 -04:00
mistyLuminescence
711e807d32 tinytweaks 2019-06-21 17:07:51 -04:00
Novacat
63f93cc97b Merge pull request #5332 from Verkister/dogsitting 
Adds resting pose selection to dogborgs
 2019-06-18 17:51:13 -04:00
Anewbe
d34b2784bb Merge pull request #6214 from Heroman3003/edge-time 
Fixes ghost-edge runtime
 2019-06-16 20:58:42 -04:00
Verkister
ff8d89db07 Merge pull request #5325 from Verkister/ridethesausage 
Brings back oties and adds riding.
 2019-06-13 14:25:39 +03:00
Verkister
c38789b7fb Adds resting pose selection to dogborgs 
-New verb to choose between resting/sitting/belly-up poses.
-New sprites for all the animated borgs (and maybe the rest later when they get anims and shit)
-Resting, sitting, and belly-up poses now come in all directions. (on the currently finished set)
-New placeholder sprite to prevent invisible borgs just in case.
-Rearranged the contents of the sprite file to a more consistent order.
-Ported the animated version of dark medihound, also gave it the poses.
 2019-06-12 23:13:18 +03:00
Verkister
de0749bff3 damage nerf 2019-06-11 08:31:20 +03:00
Novacat
8680ad38c7 Merge pull request #5328 from Heroman3003/goosefix 
Fixes geese escaping the wilderness
 2019-06-10 18:53:04 -04:00
Heroman
0c1ea5c98d Replaces different AI with shutters 2019-06-11 07:11:20 +10:00
Novacat
ea38a066fe Merge pull request #5329 from VOREStation/Verkister-patch-2 
Fixes rapala missing base_color
 2019-06-10 13:18:31 -04:00
Verkister
ea2c7077c7 Fixes rapala missing base_color 
-Basically fixes adminspawned rapala and the prosthetic limbs coming out blank white.
-Also snips out some irrelevant copypasta residue.
 2019-06-10 13:16:18 +03:00
Heroman
d6c295b226 Fixes geese escaping the wilderness 2019-06-10 17:32:13 +10:00
Verkister
d3fad1a1e6 Brings back oties and adds riding. 
-Brings back oties. Currently adminspawn only though.
-Certain niche features still missing such as sec versions reacting to crime.
-Added red guard version.
-Tamed ones can still be befriended etc.
-Minor fixes to sprites and file naming.
-Adds riding to player controlled oties and corrupt hounds.
 2019-06-09 13:26:29 +03:00
Verkister
8d01927aa7 Engie dog fixes and tweaks. 
-Gives engie dog basic magnetic and circuit grippers.
-Fixes the decompiler halving the amount on ingested sheets.
-Doubles the nerfed matter reserve recharge rates and their starting amount.
 2019-06-09 11:54:19 +03:00
Verkister
dea9e242fa Fixes borgs spinning on pounce 2019-06-05 18:28:44 +03:00
Novacat
78852d29eb Merge pull request #5311 from VOREStation/upstream-merge-6192 
[MIRROR] Prevents amber slime feeding from healing slimes
 2019-06-04 13:45:37 -04:00
Novacat
6ff16ce859 Update subtypes.dm 2019-06-04 13:30:01 -04:00
Atermonera
452af8a682 Prevents amber slime feeding from healing slimes 2019-06-04 13:16:27 -04:00
Atermonera
8be2258428 Merge pull request #6185 from chaoko99/medibots 
lowers the minimum treatment bound of medibots.
 2019-06-04 13:12:43 -04:00
Novacat
db88e4ce47 Merge pull request #5297 from Heroman3003/mercrename 
Renames Syndicate Commandos to Mercenary Commandos
 2019-06-02 13:07:54 -04:00
Heroman
34115d5a48 Renames Syndicate Commandos to mercs 2019-06-02 17:49:37 +10:00
Novacat
ae20565d46 Merge pull request #5286 from VOREStation/upstream-merge-6154 
[MIRROR] Sif Trees and Icon Scaling
 2019-05-30 13:15:12 -04:00
Unknown
c7333d5a30 Conflict Resolution 2019-05-30 13:04:41 -04:00
Atermonera
f78a4e1dc8 Sif Trees and Icon Scaling 2019-05-28 13:21:39 -04:00
Atermonera
0a8c048eb6 Merge pull request #6176 from GeneriedJenelle/patch-2 
Fixes graveyard drones becoming antag
 2019-05-28 13:12:55 -04:00
Novacat
10a1f2f0ed Update borer.dm 2019-05-24 02:04:10 -04:00
Atermonera
38e657c83f Borers TLC 1 2019-05-24 02:01:56 -04:00
mistyLuminescence
42cc20278e Big Bugfix Bonanza 2019-05-23 12:59:29 -04:00
Mechoid
7a35723d85 Sif Animal Expansion 1 2019-05-21 19:58:19 -04:00