cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,988 Commits 8 Branches 0 Tags
d68ba3ae23440e5f1e7d086cf9c7bdce783ed49a
Commit Graph

44988 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ArgobargSoup
d68ba3ae23 Changes IC Issue response to be a bit less snippy. 2018-12-04 13:52:45 -08: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
VirgoBot
5f499a85aa Adds Autolathe Cost to Knuckledusters 2018-11-09 22:05:35 -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
VirgoBot
476aae1740 Hail tweaks 2018-11-09 22:03:21 -05:00
Anewbe
87e428d29e Merge pull request #5706 from VOREStation/aro-hail 
Hail tweaks
 2018-11-09 22:03:21 -05:00
VirgoBot
6bbd7b6328 Remplace pills made by the condimaster with bouillon cubes. 2018-11-09 22:03:10 -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
Spades
e38cd74655 Merge pull request #4483 from Wickedtemp/Shadekin-Mlempathy 
Shadekin Mlempathy
 2018-11-09 18:51:47 -05:00
Wickedtemp
8ebe445436 Update alienwhitelist.txt 2018-11-06 22:10:03 -06: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
5d96ee6de7 Merge pull request #4474 from VOREStation/upstream-merge-5728 
[MIRROR] Map Bugfixes
 2018-11-05 15:35:42 -05:00
Aronai Sieyes
67a67f8c4e Merge pull request #4473 from VOREStation/upstream-merge-5700 
[MIRROR] Fixes Outdoor Electricity
 2018-11-05 15:35:25 -05: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
Aronai Sieyes
47f62d98d7 Don't alter travis pls 2018-11-05 13:51:32 -05:00
Spades
4b9a3f00e0 Merge pull request #4480 from VOREStation/aro-hosarmor 
Edit mapped in HoS armor
 2018-11-05 09:24:31 -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
VirgoBot
656fd6482c Fixes Area Initialization 2018-11-04 18:42:42 -05:00
Anewbe
eb54117edf Merge pull request #5733 from Neerti/area_initialize_fix 
Fixes Area Initialization
 2018-11-04 18:42:42 -05:00
VirgoBot
bf8a29abc7 Map Bugfixes 2018-11-02 01:01:59 -04:00
Atermonera
c7339832d1 Merge pull request #5728 from Woodratt/11/31/2018_Mapbugfixes 
Map Bugfixes
 2018-11-02 01:01:59 -04:00
VirgoBot
17e7d62c4a Fixes Outdoor Electricity 2018-11-01 13:43:25 -04:00
Neerti
eabca401a2 Fixes Outdoor Electricity (#5700) 
The surface of Sif should no longer provide free electricity.
 2018-11-01 13:43:25 -04: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
3da4bd33bc Merge pull request #4472 from VOREStation/upstream-merge-5709 
[MIRROR] Fixes a typo in gamemode vote abort message
 2018-11-01 00:02:36 -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
Aronai Sieyes
1e8274776d Merge pull request #4455 from king5327/vprofixes 
Protean Bugfixes
 2018-10-31 23:46:22 -04:00
Neerti
7e4d76c31f Fixes a typo in gamemode vote abort message 2018-10-30 18:47:09 -04:00
VirgoBot
95fddd11b5 Update silicon manifest to discord dark theme. 2018-10-30 18:42:47 -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
VirgoBot
f14cd44472 Biogenerator improvements. 2018-10-30 18:40:18 -04:00
Neerti
0e3a60e10c Merge pull request #5662 from lbnesquik/Kates-Botany-Tweak 
Biogenerator improvements.
 2018-10-30 18:40:18 -04:00
VirgoBot
7037b6dbea Fix adminhelp sound toggle respect 2018-10-30 18:38:59 -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
VirgoBot
4964360594 Remplace the plant clippers with a pair hedgetrimmers 2018-10-30 18:37:45 -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
VirgoBot
68796970d9 Port some noises from baystation. 2018-10-30 18:36:30 -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
VirgoBot
6e035c591f Minor typo fix 2018-10-30 13:06:43 -04:00
Anewbe
549adf6baf Merge pull request #5719 from lbnesquik/Kates-Typo-fix 
Minor typo fix
 2018-10-30 13:06:43 -04:00