cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 13:34:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,938 Commits 7 Branches 0 Tags
47f62d98d78c2a78af7e6f80001e8b22f95ef787
Commit Graph

21705 Commits

Author SHA1 Message Date
Neerti
bcf58840d0 Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix 
Update silicon manifest to discord dark theme.
 2018-10-30 18:42:47 -04:00
Atermonera
cab7997b27 Merge pull request #5686 from lbnesquik/Kates-Waistcoast 
Fixes all waistcoast being black when worn in the suit slot
 2018-10-23 15:00:56 -04:00
Aronai Sieyes
6fa54a605f Merge pull request #4438 from Heroman3003/intelligence-levels-2 
Added intelligence levels to some virgo mobs
 2018-10-23 14:03:21 -04:00
Aronai Sieyes
613c789b2e Merge pull request #4434 from Novacat/nova-heterochromia 
Nerfs Cash from Mining Vendor
 2018-10-23 13:12:36 -04:00
Aronai Sieyes
aca8fa397e Merge pull request #4450 from VOREStation/upstream-merge-5692 
[MIRROR] Correctly fix surgery caps selection this time.
 2018-10-23 12:33:29 -04:00
Aronai Sieyes
db37cc6c92 Merge pull request #4449 from VOREStation/upstream-merge-5693 
[MIRROR] Fixes duplication of corpses by holding and then cooking
 2018-10-23 12:33:14 -04:00
Aronai Sieyes
e6441d56a4 Merge pull request #4442 from VOREStation/upstream-merge-5694 
[MIRROR] Fix for duplicated loadout descriptions
 2018-10-23 12:33:04 -04:00
Atermonera
b2e676d216 Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix 
Correctly fix surgery caps selection this time.
 2018-10-22 20:55:18 -04:00
Shophaune
fad2beb82e Fixes duplication of corpses by holding and then cooking (#5693) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Fix for cooking mob duplication

* Actually this is a better method, thanks Baystation

Yeah they kinda fixed it three days ago way better than I did it so
 2018-10-22 20:54:02 -04:00
Shophaune
7266f28757 Fix for duplicated loadout descriptions (#5694) 
* Add files via upload

* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"

This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590.

* Borrowing Ibnesquik's descriptions to fix this issue quickly.
 2018-10-21 14:23:59 -04:00
Heroman3003
dde664c1fb Added intelligence levels to some virgo mobs 2018-10-21 07:49:49 +10:00
Aronai Sieyes
7c522fc0c4 Revert "Stethoscope vore shitpost" 2018-10-20 17:43:06 -04:00
Spades
50825403df Merge pull request #4317 from lbnesquik/Kates-stethoscope-Feature 
Stethoscope vore shitpost
 2018-10-20 17:39:55 -04:00
Aronai Sieyes
d6cdba16c8 Merge pull request #4432 from VOREStation/upstream-merge-5685 
[MIRROR] Fix for Viewing Newly Made Records
 2018-10-20 17:37:34 -04:00
Aronai Sieyes
2d6d05acb0 Merge pull request #4429 from VOREStation/upstream-merge-5663 
[MIRROR] More paths to Quick_Create
 2018-10-20 17:37:20 -04:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert 
ERT Equipment Redo
 2018-10-20 17:34:41 -04:00
Aronai Sieyes
382c6b5152 VS edit merge 2018-10-20 17:28:24 -04:00
Unknown
c674f13de4 Nerfs Cash from Mining Vendor 
The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.
 2018-10-20 14:50:43 -04:00
Spades
dbec51db41 Merge pull request #4433 from Verkister/infixfix 
Fixes examine for mobs that relied on atom proc specific features.
 2018-10-20 08:58:05 -04:00
Spades
79d5ece0b3 Merge pull request #4430 from VOREStation/upstream-merge-5690 
[MIRROR] Fix wax appearing to be steel.
 2018-10-20 08:57:38 -04:00
Spades
87210df046 Merge pull request #4428 from VOREStation/upstream-merge-5667 
[MIRROR] Bring back the traitor panel verb.
 2018-10-20 08:56:39 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor 
Replaces awoo with wolfgirl
 2018-10-20 08:56:14 -04:00
Spades
6d3b8812f5 Merge pull request #4344 from Novacat/nova-heterochromia 
Reverts species settings
 2018-10-20 08:52:05 -04:00
Verkister
81fa928d4c Fixes examine for mobs that relied on atom proc features. 
-Mainly affected borgs and pAIs. Maybe others idk.
 2018-10-20 14:47:39 +03:00
Neerti
e019d0c8ef Fixes new record bug. (#5685) 2018-10-20 03:36:16 -04:00
Neerti
ea6a9f2df5 Merge pull request #5690 from lbnesquik/Kates-Wax-Fix 
Fix wax appearing to be steel.
 2018-10-20 00:07:01 -04:00
Neerti
360103a487 More paths to Quick_Create 2018-10-20 00:05:48 -04:00
Neerti
e46506adf7 Merge pull request #5667 from lbnesquik/Kates-Admin-Tweak² 
Bring back the traitor panel verb.
 2018-10-20 00:05:37 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Sebbe9123
df23ae9891 Adds toggle for secpatch 
You can now toggle and switch what eye the secpatch covers for all your partial blindness needs.
 2018-10-18 11:27:04 +02:00
Spades
ea12d3d18c Merge pull request #4328 from lbnesquik/Kates-Citborg-Port 
Dogborgs start with full water reserves.
 2018-10-17 17:28:51 -04:00
Neerti
972777fd94 Adds Mods/Dev perms to ticket permission checks (#5683) 2018-10-16 18:28:14 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Unknown
d91b8af845 Requested Changes 3 2018-10-16 14:04:05 -04:00
Aronai Sieyes
8c764d487d Merge pull request #4340 from Novacat/nova-pathfinder 
Exploration Fixes for 09-27-2018 Sync
 2018-10-16 12:27:52 -04:00
Aronai Sieyes
ce0450e218 Merge pull request #4399 from VOREStation/upstream-merge-5666 
[MIRROR] Magazines improvements
 2018-10-16 12:19:06 -04:00
Aronai Sieyes
3b2d47087f Merge pull request #4397 from VOREStation/upstream-merge-5671 
[MIRROR] Prevent people from removing papers from any distances.
 2018-10-16 12:18:55 -04:00
Aronai Sieyes
872eff5004 Merge pull request #4395 from VOREStation/upstream-merge-5670 
[MIRROR] Fix a couple of ticket bugs
 2018-10-16 12:18:46 -04:00
Aronai Sieyes
d66c8e326b Merge pull request #4394 from VOREStation/upstream-merge-5652 
[MIRROR] Fixes missing sprites when excavating rocks
 2018-10-16 12:18:35 -04:00
Aronai Sieyes
fac9a2c121 Merge pull request #4393 from VOREStation/upstream-merge-5647 
[MIRROR] Add a noise for mining scanners.
 2018-10-16 12:18:14 -04:00
Aronai Sieyes
78bd63d568 Merge pull request #4392 from VOREStation/upstream-merge-5626 
[MIRROR] Move almost everything food related into the kitchen module.
 2018-10-16 12:18:05 -04:00
Aronai Sieyes
9dc2f288a0 Clean up two-way merge 2018-10-16 12:08:31 -04:00
Arokha Sieyes
ce187f64ed Fixup other vorestation things 
Stop using the web editor please
 2018-10-16 12:05:32 -04:00
Spades
5b755d757a Merge pull request #4396 from VOREStation/upstream-merge-5674 
[MIRROR] Removes maintenance access from cleanbots
 2018-10-15 17:32:14 -04:00
Kates
26089f3a72 Magazines improvements 2018-10-15 15:52:56 -04:00
Anewbe
935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs 
Stop usage of multiple vision modifiers
 2018-10-15 15:51:43 -04:00
Anewbe
34ee689609 Merge pull request #5671 from lbnesquik/Kates-Fax-Fix 
Prevent people from removing papers from any distances.
 2018-10-15 15:51:30 -04:00
Anewbe
8ccd796753 Merge pull request #5674 from Nalarac/patch-1 
Removes maintenance access from cleanbots
 2018-10-15 15:50:13 -04:00
Anewbe
6e5a5f5edc Fix a couple of ticket bugs 2018-10-15 15:49:58 -04:00
Anewbe
6bf9647ff7 Merge pull request #5652 from Cerebulon/excavation_sprite 
Fixes missing sprites when excavating rocks
 2018-10-15 15:48:42 -04:00