cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 02:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,809 Commits 7 Branches 0 Tags
6bf9647ff76b6878f05102a6dc6f7ca1b5c04a03
Commit Graph

33192 Commits

Author SHA1 Message Date
Anewbe
6bf9647ff7 Merge pull request #5652 from Cerebulon/excavation_sprite 
Fixes missing sprites when excavating rocks
 2018-10-15 15:48:42 -04:00
Arokha Sieyes
e6bf904252 VS edit 2018-10-13 19:20:13 -04:00
Anewbe
51a493427d Graves (#5622) 
* Adds support for closets storing closets, and graves

* More Grave Things
 2018-10-13 17:58:48 -04:00
Aronai Sieyes
d4ddd57bf2 Merge pull request #4371 from VOREStation/upstream-merge-5656 
[MIRROR] Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
 2018-10-13 17:42:13 -04:00
Aronai Sieyes
20c44e4cf0 Merge pull request #4370 from VOREStation/upstream-merge-5655 
[MIRROR] Wax can stacxk
 2018-10-13 17:39:30 -04:00
Aronai Sieyes
01539b5468 Merge pull request #4368 from VOREStation/upstream-merge-5648 
[MIRROR] Prevents people from HREF exploiting around the R&D console lock.
 2018-10-13 17:29:47 -04:00
Atermonera
eb1bbac042 Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix 
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
 2018-10-13 17:17:27 -04:00
Atermonera
a74ec39eed Merge pull request #5655 from lbnesquik/Kates-Wax-Fix 
Wax can stacxk
 2018-10-13 17:16:14 -04:00
Atermonera
dde25a46f0 Merge pull request #5648 from king5327/polarissciconfix 
Prevents people from HREF exploiting around the R&D console lock.
 2018-10-13 17:14:48 -04:00
Atermonera
54a24d244f Merge pull request #5657 from lbnesquik/Kates-Cap-Fix 
Move surgery caps into their own selection.
 2018-10-13 17:13:32 -04:00
Arokha Sieyes
5fe59a1f2a Critical maploader fix 
Definitely do not update the server without this change.
And a gateway tweak thing because that was my original intent with this branch.
 2018-10-13 01:36:26 -04:00
Aronai Sieyes
5f10bf5444 Merge pull request #4352 from Screemonster/prommiecoreicons 
gives prommie cores an icon
 2018-10-12 21:35:00 -04:00
Spades
4bea97df74 Merge pull request #4360 from lbnesquik/Kates-Flight-Tweak 
Adjust winged flight cost and description.
 2018-10-12 19:21:36 -04:00
Spades
85bcb03327 Merge pull request #4361 from lbnesquik/Kates-Catgirl-Tweak 
Makes it so standard catgirls can appear.
 2018-10-12 19:18:52 -04:00
Spades
561f196591 Merge pull request #4336 from Screemonster/pouncechanges 
Gives pounces a chance to fail
 2018-10-12 19:18:29 -04:00
Screemonster
f513ca75bb use the proper proc for this thing 2018-10-12 15:34:02 +01:00
lbnesquik
7bde126b8c Fixes weird typos. 2018-10-12 15:49:27 +02:00
lbnesquik
941896a165 Makes it so standard catgirls can appear. 2018-10-12 12:34:30 +02:00
lbnesquik
95445d808d Reduce Flight cost 2018-10-12 12:24:30 +02:00
Spades
6f48c01382 Merge pull request #4333 from kcin2001/fixes 
fixes copy paste error
 2018-10-12 06:00:28 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats 
Log trait and species usage for metrics
 2018-10-12 01:45:54 -04:00
Screemonster
7d6731f39e shove this shit in procs 2018-10-12 06:40:17 +01:00
Aronai Sieyes
1faaecb320 Merge pull request #4346 from VOREStation/upstream-merge-5632 
[MIRROR] Remplace sprite hammer with pickaxe
 2018-10-12 01:12:44 -04:00
Aronai Sieyes
a84074572a Merge pull request #4338 from Screemonster/shadefluffers 
Minor shadekin fixes
 2018-10-11 23:52:18 -04:00
Aronai Sieyes
a5afd37e18 Merge pull request #4318 from lbnesquik/Kates-Nevrean-Fix 
Adds nevrean eggs.
 2018-10-11 23:15:12 -04:00
Aronai Sieyes
1ece0b15a8 Merge pull request #4299 from ArgobargSoup/master 
Bug abdomens
 2018-10-11 21:42:54 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics 
Just some stuff for use in building statistics about characters
 2018-10-11 20:49:33 -04:00
Aronai Sieyes
79d590140e Merge pull request #4347 from VOREStation/upstream-merge-5617 
[MIRROR] Admin ticket system (for real this time)
 2018-10-10 21:22:59 -04:00
Arokha Sieyes
164c72267c Vorestation specific tweaks for tickets 2018-10-10 18:17:13 -04:00
Aronai Sieyes
ed525cef2c Merge pull request #4355 from VOREStation/upstream-merge-5650 
[MIRROR] Fix incorrect HUD/screen/hologram
 2018-10-10 17:40:57 -04:00
Aronai Sieyes
09035a8742 Merge pull request #4353 from VOREStation/upstream-merge-5646 
[MIRROR] Remove intensity from chemistry machines.
 2018-10-10 17:40:26 -04:00
Aronai Sieyes
52a993541a Merge pull request #4348 from VOREStation/upstream-merge-5641 
[MIRROR] Fixes several typos with oxygen_pump.dm.
 2018-10-10 17:40:09 -04:00
Aronai Sieyes
ea6867363b Merge pull request #4343 from VOREStation/upstream-merge-5640 
[MIRROR] Fixes laptop blocking grown adults.
 2018-10-10 17:27:24 -04:00
Screemonster
5644ee00fd forgot to mark edit 2018-10-10 22:17:20 +01:00
Anewbe
dc781b806d Merge pull request #5650 from lbnesquik/Kates-Why-Do-I-Have-To-Fix-This 
Fix incorrect HUD/screen/hologram
 2018-10-10 16:54:53 -04:00
Anewbe
726f01e15e Merge pull request #5646 from lbnesquik/Kates-Tiny-Tweak 
Remove intensity from chemistry machines.
 2018-10-10 16:54:30 -04:00
Screemonster
b34714684a gives prommie cores an icon 2018-10-10 13:48:22 +01:00
Spades
12b0f7fdff Merge pull request #4342 from VOREStation/upstream-merge-5635 
[MIRROR] Fix yes emote not working correctly.
 2018-10-10 05:27:04 -04:00
Spades
ae8b60f0d8 Merge pull request #4341 from VOREStation/upstream-merge-5634 
[MIRROR] Remove kobold.dm
 2018-10-10 05:26:42 -04:00
Spades
5b91c8fccd Merge pull request #4339 from Screemonster/idontgetsickigivesick 
Xenochimera virus tweak
 2018-10-09 17:07:36 -04:00
Spades
6988bfcc44 Merge pull request #4329 from VOREStation/upstream-merge-5638 
[MIRROR] Fixes chem master dumping reagents.
 2018-10-09 17:06:11 -04:00
Anewbe
e362c66f51 Merge pull request #5641 from avabee/patch-3 
Fixes several typos with oxygen_pump.dm.
 2018-10-09 16:36:23 -04:00
Anewbe
e4660c5838 Admin ticket system (for real this time) 2018-10-09 16:31:01 -04:00
Anewbe
f0db332943 Remplace sprite hammer with pickaxe 2018-10-09 16:28:45 -04:00
Atermonera
3943ef3dba Merge pull request #5640 from lbnesquik/Kates-Laptop-Fix 
Fixes laptop blocking grown adults.
 2018-10-09 13:52:53 -04:00
Atermonera
6be6f9a957 Merge pull request #5635 from lbnesquik/Kates-Emote-Fix 
Fix yes emote not working correctly.
 2018-10-09 13:48:35 -04:00
Atermonera
6b6f811278 Merge pull request #5634 from lbnesquik/Kates-Kobold-Remov 
Remove kobold.dm
 2018-10-09 13:44:16 -04:00
Screemonster
e3356ed5fe Xenochimera tweak 2018-10-09 14:12:02 +01:00
Screemonster
ebd235ed1e fix pounces for those dirty nonvore types 2018-10-09 13:47:45 +01:00
Screemonster
71f5870b46 Minor shadekin fixes 2018-10-09 13:15:13 +01:00