cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,989 Commits 10 Branches 0 Tags
4c46defd4f23a1ec84efe5b9ab9fc29b10d888ae
Commit Graph

33301 Commits

Author SHA1 Message Date
pontifexminimus2
4c46defd4f Renaming Protector too. 2018-11-25 16:50:24 +01:00
pontifexminimus2
784e48b895 Holy shit I hate this. 2018-11-25 16:45:37 +01:00
Aronai Sieyes
2455d4b84e Merge pull request #4487 from VOREStation/upstream-merge-5730 
[MIRROR] Adds Autolathe Cost to Knuckledusters
 2018-11-11 12:55:11 -05:00
Aronai Sieyes
f542c51194 Merge pull request #4486 from VOREStation/upstream-merge-5706 
[MIRROR] Hail tweaks
 2018-11-11 12:54:58 -05:00
Aronai Sieyes
e97e1f3999 Merge pull request #4485 from VOREStation/upstream-merge-5689 
[MIRROR] Remplace pills made by the condimaster with bouillon cubes.
 2018-11-11 12:54:50 -05:00
Aronai Sieyes
9334850388 Merge pull request #4479 from VOREStation/upstream-merge-5733 
[MIRROR] Fixes Area Initialization
 2018-11-11 12:54:25 -05:00
Anewbe
fa9c8abea0 Merge pull request #5730 from Nalarac/patch-2 
Adds Autolathe Cost to Knuckledusters
 2018-11-09 22:05:35 -05:00
Anewbe
87e428d29e Merge pull request #5706 from VOREStation/aro-hail 
Hail tweaks
 2018-11-09 22:03:21 -05:00
Kates
2e778f1c09 Remplace pills made by the condimaster with bouillon cubes. (#5689) 
* Remplace pills made by the condimaster with bouillon cubes.
Just a couple lines remplace so the condimaster can create pills which look like bouillon cubes (monkey cubes)
The .DMI change is just me adding the monkey cube sprite with a different name. It was fair easier than to have the template look into another file for the icon.

* Remove duplicates

* Fix names being redundant

* Add a description for ze pill.
 2018-11-09 22:03:10 -05:00
Wickedtemp
858dbd6ddf Allows for Whitelst 
As per the SCA for Tempest being approved, and so Zal doesn't have to manually add it to their character every time they log in.
 2018-11-06 22:05:12 -06:00
Aronai Sieyes
3b5b03e05b Merge pull request #4471 from VOREStation/upstream-merge-5701 
[MIRROR] Update silicon manifest to discord dark theme.
 2018-11-05 15:25:41 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor 
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
 2018-11-04 22:51:32 -05:00
Anewbe
eb54117edf Merge pull request #5733 from Neerti/area_initialize_fix 
Fixes Area Initialization
 2018-11-04 18:42:42 -05:00
Aronai Sieyes
096400b312 Merge pull request #4470 from VOREStation/upstream-merge-5698 
[MIRROR] Prometheans can process blood without exploding.
 2018-11-01 00:22:04 -04:00
Aronai Sieyes
425616a91b Fix vs edit conflict 2018-11-01 00:01:27 -04:00
Aronai Sieyes
00c3e88542 Merge pull request #4469 from VOREStation/upstream-merge-5662 
[MIRROR] Biogenerator improvements.
 2018-10-31 23:59:20 -04:00
Aronai Sieyes
2b5e073137 Merge pull request #4468 from VOREStation/upstream-merge-5705 
[MIRROR] Fix adminhelp sound toggle respect
 2018-10-31 23:58:54 -04:00
Aronai Sieyes
8ac7ad274f Merge pull request #4467 from VOREStation/upstream-merge-5691 
[MIRROR] Remplace the plant clippers with a pair hedgetrimmers
 2018-10-31 23:58:23 -04:00
Aronai Sieyes
6578b68adb Merge pull request #4466 from VOREStation/upstream-merge-5665 
[MIRROR] Port some noises from baystation.
 2018-10-31 23:57:57 -04:00
Aronai Sieyes
06140ba6b7 Merge pull request #4465 from VOREStation/upstream-merge-5719 
[MIRROR] Minor typo fix
 2018-10-31 23:57:39 -04:00
Aronai Sieyes
48308e6393 Merge pull request #4457 from Keekenox/informativename 
add medium angel wing sprites
 2018-10-31 23:47:52 -04:00
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
Neerti
feabaafa6e Prometheans can process blood without exploding. 2018-10-30 18:41:34 -04:00
Neerti
0e3a60e10c Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak 
Biogenerator improvements.
 2018-10-30 18:40:18 -04:00
Neerti
8333f3cd0b Merge pull request #5705 from VOREStation/aro-bwoink 
Fix adminhelp sound toggle respect
 2018-10-30 18:38:59 -04:00
Neerti
68d1d5cce9 Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature 
Remplace the plant clippers with a pair hedgetrimmers
 2018-10-30 18:37:45 -04:00
Neerti
aa13df67fe Merge pull request #5665 from lbnesquik/Kates-Machinery-Port 
Port some noises from baystation.
 2018-10-30 18:36:30 -04:00
Anewbe
549adf6baf Merge pull request #5719 from lbnesquik/Kates-Typo-fix 
Minor typo fix
 2018-10-30 13:06:43 -04:00
Keekenox
1c25ffe12a Switched off unit test 11 because the build had to go out now and there was no time to fix it properly. 
Wingy bois
 2018-10-27 16:07:06 -04:00
Aronai Sieyes
816a5c9a57 Fix mistyped macro and indent 2018-10-25 17:35:42 -04:00
Andrei Jors
9fb6894a07 Brings this over from Citadel. Ignore the CITADEL CHANGE comments. 2018-10-25 17:16:05 -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
Aronai Sieyes
3cc636fbef Merge pull request #4441 from VOREStation/upstream-merge-5695 
[MIRROR] Fixes PDA manifest excluding all non-syndie borgs
 2018-10-23 12:32:57 -04:00
Spades
6e754dd19b Merge pull request #4439 from VOREStation/revert-4317-Kates-stethoscope-Feature 
Revert "Stethoscope vore shitpost"
 2018-10-23 05:46:18 -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
Verkister
acdbd65e22 Fixes PDA manifest excluding all non-syndie borgs (#5695) 
* Fixes PDA manifest excluding all non-syndie borgs

I'm preetty sure the original PR had the opposite intention of what it actually did.

* Update obj.dm

* Update obj.dm
 2018-10-21 14:23:48 -04:00
Aronai Sieyes
86cf5cfca7 Merge pull request #4431 from VOREStation/upstream-merge-5675 
[MIRROR] Ports Vote to SMC
 2018-10-20 17:58:12 -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
Arokha Sieyes
30a8a3ce31 VS edit merges 2018-10-20 17:37:08 -04:00