cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,131 Commits 9 Branches 0 Tags
273f7540b6448ab8db42d72d73cee1a2743a4d24
Commit Graph

38077 Commits

Author SHA1 Message Date
Heroman
273f7540b6 Brings some variety and color to back to closets 2020-06-07 06:45:22 +10:00
Aronai Sieyes
499b9b51f4 Merge pull request #8204 from VOREStation/upstream-merge-7241 
[MIRROR] Adds proc to replace default cells with high cap on machinery
 2020-06-05 15:53:51 -04:00
Aronai Sieyes
b525608228 Merge pull request #8203 from VOREStation/upstream-merge-7262 
[MIRROR] fixes hybrid crowbars
 2020-06-05 15:53:15 -04:00
Aronai Sieyes
a5a56fe6db Merge pull request #8200 from VOREStation/upstream-merge-7261 
[MIRROR] Another Lesser Rotation
 2020-06-05 15:52:40 -04:00
Aronai Sieyes
ce496d94fa Merge pull request #8198 from VOREStation/upstream-merge-7249 
[MIRROR] Species Vars Extension
 2020-06-05 15:52:24 -04:00
Atermonera
28e952806c Adds proc to replace default cells with high cap on machinery (#7241) 
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
 2020-06-04 22:38:39 -04:00
Atermonera
09d5356ba2 Merge pull request #7262 from lolman360/master 
fixes hybrid crowbars
 2020-06-04 22:26:59 -04:00
Atermonera
e13927d412 Merge pull request #7261 from Cerebulon/rotationpart2 
Another Lesser Rotation
 2020-06-04 22:25:21 -04:00
Arokha Sieyes
ad119f676d Species Vars Extension 2020-06-04 21:02:56 -04:00
lm40
b23594340d fixes typo 2020-06-03 19:38:58 -04:00
H0lySquirr3l
c61477dfce Add files via upload 2020-06-03 15:13:50 -05:00
Aronai Sieyes
b724d71d7d Merge pull request #8177 from Heroman3003/merm 
Adds mermaid tails taur option
 2020-06-03 10:27:58 -04:00
Aronai Sieyes
fd7401afea Merge pull request #8176 from VOREStation/upstream-merge-7136 
[MIRROR] Add AI Picture-in-Picture Mode!
 2020-06-03 10:27:30 -04:00
Atermonera
affd284004 Add AI Picture-in-Picture Mode! 2020-06-03 10:09:30 -04:00
Aronai Sieyes
5fbc81ebbf Merge pull request #8185 from VOREStation/Arokha/getcellmine 
Adds get_cell to drill heads so you can use an inducer on them
 2020-06-02 23:33:44 -04:00
Aronai Sieyes
21a640ebd3 Adds get_cell to drill heads so you can use an inducer on them 2020-06-02 20:56:55 -04:00
Unknown
8d170c8468 Removes Exploration Weapon Permits 2020-06-02 19:35:36 -04:00
Unknown
67675370ca Makes Mercs Smart 
Also reverts the health nerf on the ADG
 2020-06-02 15:47:43 -04:00
Aronai Sieyes
c6b1e4f53e Merge pull request #8174 from VOREStation/Arokha/lava 
Prevents lava from being blown up
 2020-06-01 20:56:04 -04:00
Kenzie
a82de6eddd fixes small package examination 2020-06-01 20:42:37 -04:00
Heroman
5fd9552e8a Adds mermaid tails taur option 2020-06-02 06:42:38 +10:00
Aronai Sieyes
b8355dd464 Prevents lava from being blown up 2020-06-01 13:42:24 -04:00
Aronai Sieyes
27d3bf2b0f Merge pull request #8169 from VOREStation/upstream-merge-7247 
[MIRROR] Port various auto-decorating floors from Eris
 2020-06-01 13:11:41 -04:00
Atermonera
6219a0b4e8 Port various auto-decorating floors from Eris 2020-06-01 12:29:14 -04:00
Aronai Sieyes
54454830d4 Merge pull request #8171 from SweetBlueSylveon/Recipe-fix 
Recipe and Icon fix
 2020-05-31 23:55:06 -04:00
Arokha Sieyes
1738b66b3c Be really specific about turf decal layers 2020-05-31 22:55:36 -04:00
SweetBlueSylveon
6a2788f204 Update Chemistry-Recipes_vr.dm 2020-05-31 16:20:46 -07:00
SweetBlueSylveon
21198ba8df Update Chemistry-Recipes_vr.dm 2020-05-31 16:18:09 -07:00
SweetBlueSylveon
c766de0a92 Drink update Patch 
Fixes 4 recipes
Fixes missing metaglass icon bug.
 2020-05-31 16:14:36 -07:00
Aronai Sieyes
852cdbc347 VS: Add Autolok wall lockers and put some around various maps 2020-05-31 16:59:39 -04:00
Aronai Sieyes
d5de7fc136 Don't let people hide in tiny wall closets 2020-05-31 16:58:57 -04:00
Aronai Sieyes
9789b1d565 Add emergency suit cooler unit with fixed lowpower cell 2020-05-31 16:58:39 -04:00
Aronai Sieyes
b7a22c755f Add icon bases since these are invisible on map otherwise 2020-05-31 13:07:19 -04:00
Aronai Sieyes
7c4428d697 Prep for map updates 2020-05-31 12:39:39 -04:00
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
35eee1fe2a Merge pull request #8149 from VOREStation/upstream-merge-7164 
[MIRROR] Ported /tg/ style screen alerts, replacing the hunger icon with them
 2020-05-31 12:15:48 -04:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
Leshana
94259e9476 Merge pull request #8148 from VOREStation/upstream-merge-7210 
[MIRROR] [PORT] Static Machinery Power
 2020-05-31 11:51:31 -04:00
Atermonera
a06aa9bdf6 [PORT] Static Machinery Power 2020-05-31 11:16:41 -04:00
Aronai Sieyes
76d20e4c7e Merge pull request #8154 from VOREStation/upstream-merge-7243 
[MIRROR] Blob Infinite Loop Fix
 2020-05-31 10:59:20 -04:00
Aronai Sieyes
80d6fdee86 Merge pull request #8158 from VOREStation/Arokha/autolokfix 
Fix copypaste error
 2020-05-31 10:53:17 -04:00
Aronai Sieyes
e341769720 Merge pull request #8163 from KillianKirilenko/kk-suits 
AutoLok Tweaks
 2020-05-31 10:52:45 -04:00
Killian
710cee0208 Update void_vr.dm 2020-05-31 11:04:13 +01:00
SweetBlueSylveon
9640367e88 Fixes two drinks. 
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
 2020-05-31 01:59:34 -07:00
Arokha Sieyes
86242e421b Fix copypaste error 2020-05-31 01:27:50 -04:00
Atermonera
9e77aca051 Merge pull request #7243 from Mechoid/BlobLoop 
Blob Infinite Loop Fix
 2020-05-31 00:23:40 -04:00
Natje0
c882cd57ca add tentacle 2020-05-31 01:43:17 +02:00
Aronai Sieyes
a5de42d181 Merge pull request #8140 from SweetBlueSylveon/Drink-update 
Drink update
 2020-05-30 19:09:25 -04:00
SweetBlueSylveon
2c3c8e8450 Patch 2 
Fixed indentations.
Removed "Icon_state" and "center_of_mass" where stated a second time.
 2020-05-30 15:57:03 -07:00