cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-20 22:33:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,093 Commits 8 Branches 0 Tags
3ca4336586b0ca7f0bf92bbc4ec3fb81eb7c7b34
Commit Graph

12726 Commits

Author SHA1 Message Date
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Nadyr
7438d0f486 Merge pull request #2453 from CHOMPStationBot/upstream-merge-10948 
[MIRROR] Adds a weretiger.
 2021-07-08 00:15:00 -04:00
Nadyr
2c1005a60f Merge pull request #2448 from CHOMPStationBot/upstream-merge-10937 
[MIRROR] Some plane tweaks.
 2021-07-08 00:14:47 -04:00
Nadyr
207513d17d Merge pull request #2443 from CHOMPStationBot/upstream-merge-10943 
[MIRROR] Fix a handful of ghost/admin verbs
 2021-07-08 00:01:14 -04:00
Nadyr
cbafdd15a0 Merge pull request #2456 from CHOMPStationBot/upstream-merge-10957 
[MIRROR] Simplemobs can do cool emotes now
 2021-07-08 00:00:23 -04:00
Nadyr
1212755f9c Merge pull request #2455 from CHOMPStationBot/upstream-merge-10953 
[MIRROR] Fix security cameras showing weird space thing
 2021-07-07 23:59:57 -04:00
Nadyr
74a5348126 Merge pull request #2449 from CHOMPStationBot/upstream-merge-10945 
[MIRROR] 4 fixes
 2021-07-07 23:55:47 -04:00
Nadyr
7846005ead powder that makes you say yes 2021-07-07 23:55:15 -04:00
Nadyr
56649cac06 Merge pull request #2439 from CHOMPStationBot/upstream-merge-10928 
[MIRROR] SSInput and Diagonal Movement
 2021-07-07 23:53:36 -04:00
Nadyr
b88233de91 powder that makes you say yes 2021-07-07 23:50:59 -04:00
Nadyr
89438f1256 Merge pull request #2440 from CHOMPStationBot/upstream-merge-10931 
[MIRROR] Makes ghosts able to play as some mobs sometimes
 2021-07-07 23:46:55 -04:00
Nadyr
97181764d3 powder that makes you say yes 2021-07-07 23:45:33 -04:00
Aronai Sieyes
d95001837b Merge pull request #10954 from Very-Soft/protectpoppyandchicks 
Protects Poppy and chicks from being vored
 2021-07-07 23:46:55 +00:00
Aronai Sieyes
f9c7593677 Merge pull request #10957 from Very-Soft/simplemobemotes 
Simplemobs can do cool emotes now
 2021-07-07 23:43:28 +00:00
Aronai Sieyes
378fd085fc Merge pull request #10953 from VOREStation/Arokha/seccamera 
Fix security cameras showing weird space thing
 2021-07-07 21:15:05 +00:00
Chompstation Bot
28c2ee46d3 Adds a weretiger. 2021-07-07 21:08:45 +00:00
Aronai Sieyes
afd142bd6a Merge pull request #10945 from VOREStation/Arokha/fixes333 
4 fixes
 2021-07-07 19:04:22 +00:00
Chompstation Bot
ef79e49ee2 Some plane tweaks. 2021-07-07 19:03:14 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
b22cc8df95 Fix a handful of ghost/admin verbs 2021-07-07 18:39:12 +00:00
Aronai Sieyes
1deccaed87 Merge pull request #10931 from Very-Soft/ghostlyanimals 
Makes ghosts able to play as some mobs sometimes
 2021-07-07 18:37:53 +00:00
Chompstation Bot
1513fbe0cb SSInput and Diagonal Movement 2021-07-07 18:35:44 +00:00
Nadyr
7e10238662 Merge pull request #2409 from Cyrelius/Cyrelius-patch-2 
Doggo-borg improvements and AI shell options.
 2021-07-06 19:03:11 -04:00
Verkister
fbba26d1ba Fixes playercontrolled voremobs getting no belly 
Fixes playercontrolled voremobs not getting their belly loaded if the player opens vorepanel without triggering the mob's own init_vore beforehand.
 2021-07-06 22:09:41 +03:00
Nadyr
a2c1ee213a Merge pull request #2433 from CHOMPStationBot/upstream-merge-10927 
[MIRROR] Add pouches!
 2021-07-05 23:32:49 -04:00
Chompstation Bot
b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Aronai Sieyes
506d9d53f4 Merge pull request #10847 from MarinaGryphon/nailpolish 
Adds nail polish.
 2021-07-05 23:56:25 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Nadyr
b40f14fc6b Merge pull request #2419 from CHOMPStationBot/upstream-merge-10905 
[MIRROR] Fixes #10904
 2021-07-05 16:19:36 -04:00
Nadyr
78698322b8 Merge pull request #2417 from CHOMPStationBot/upstream-merge-10907 
[MIRROR] Fixes #10896
 2021-07-05 16:19:18 -04:00
Nadyr
1a95ae8d0b Merge pull request #2418 from CHOMPStationBot/upstream-merge-10906 
[MIRROR] Fix unused var warning
 2021-07-05 16:08:07 -04:00
Nadyr
e2ce9a6fbf Merge pull request #2402 from Cyrelius/Cyrelius-patch-1 
Darksight improvement.
 2021-07-05 16:06:43 -04:00
Nadyr
221dffa8b9 Merge branch 'master' into upstream-merge-10905 2021-07-05 16:04:30 -04:00
Nadyr
4f5730fd8a powder that makes you say yes 2021-07-05 16:03:57 -04:00
Nadyr
5280baea21 powder that makes you say yes 2021-07-05 16:03:02 -04:00
Nadyr
51c62c4ce0 Merge branch 'master' into upstream-merge-10906 2021-07-05 15:59:26 -04:00
Nadyr
81be69c813 powder that makes you say yes 2021-07-05 15:58:21 -04:00
Nadyr
2274c1a218 Merge pull request #2413 from CHOMPStationBot/upstream-merge-10892 
[MIRROR] Fix observer message lies
 2021-07-05 15:55:13 -04:00
Chompstation Bot
7ef11b40bf Fixes #10904 2021-07-05 16:20:05 +00:00
Chompstation Bot
e531aba8c1 Fix unused var warning 2021-07-05 16:19:57 +00:00
Chompstation Bot
6b6a138221 Fixes #10896 2021-07-05 16:19:51 +00:00
Aronai Sieyes
e2ae927930 Merge pull request #10892 from VOREStation/Arokha/obsmessage 
Fix observer message lies
 2021-07-05 06:36:48 +00:00
Aronai Sieyes
90768085c8 Merge pull request #10890 from VOREStation/Arokha/hairfix 
Fixes #10884
 2021-07-05 06:32:31 +00:00
Cyrelius
7a7fd6e246 Update robot.dm 
Add Chompedit tags
 2021-07-04 19:11:26 -07:00
Cyrelius
0f8be36f1d Merge branch 'CHOMPStation2:master' into Cyrelius-patch-2 2021-07-04 16:31:29 -07:00
Aronai Sieyes
3028575a34 Merge pull request #10868 from VOREStation/Fixes/10730 
Fix taur tail paths
 2021-07-04 22:48:17 +00:00
Cyrelius
928f1bc1a8 Update station_vr.dm 
Brings engie dog more in line with the regular engie borg.
Increases water capacity for Medihound, giving them more staying power on a longer journey.
Allowed water to be refilled from rechargers.  (come on, they can synthesize plasteel for fuck's sake, water isn't that complicated)
 2021-07-04 12:23:41 -07:00
Cyrelius
9f80ca88a5 Update robot.dm 
Adds Combat and ERT as AI shell types, given either an admin override or red alert.
 2021-07-04 10:33:46 -07:00
Cyrelius
8bbf812913 Re-add darksight to Positive_ch.dm 2021-07-04 09:22:15 -07:00
Cyrelius
d36589b610 DarkSight changes 
Bumping darksight's range up one, and major darksight's up two.
 2021-07-04 09:16:16 -07:00