cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-08 00:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,212 Commits 8 Branches 0 Tags
faba4dc825c7fc8b69bb76ea221389cb4e10495d
Commit Graph

2324 Commits

Author SHA1 Message Date
Nadyr
88ea62510a Merge branch 'master' into upstream-merge-11459 2021-08-24 23:23:57 -04:00
Aronai Sieyes
c1632a1c71 Merge pull request #11439 from PastelPrinceDan/rdlabcoat 
Ports RD labcoat from CitRP
 2021-08-24 23:06:09 -04:00
Chompstation Bot
e209b4cfb2 Adds winter coats to their respective lockers/vendors 2021-08-24 23:59:02 +00:00
Chompstation Bot
f5212e0053 Fix Salamanders and Wall-lockers 2021-08-13 15:40:58 +00:00
Aronai Sieyes
4a39834222 Merge pull request #11385 from Very-Soft/maintpredintro 
Adds extra text to maint pred and morph spawns
 2021-08-10 23:12:09 +00:00
Aronai Sieyes
7463a1bd6e Merge pull request #11368 from VOREStation/Arokha/closetanim 
Port of monster860's animated doors to Bay closets
 2021-08-09 03:28:57 +00:00
Aronai Sieyes
a66ac79179 Merge pull request #11336 from VOREStation/Icons/skyratexting 
Skyrat extinguisher cabinet sprites
 2021-08-06 15:36:06 +00:00
Aronai Sieyes
b93b572626 Merge pull request #11331 from VOREStation/Icons/skyratbenches 
Skyrat benches
 2021-08-04 02:50:20 +00:00
Nadyr
aa3c056af6 powder that makes you say yes 2021-08-01 15:11:58 -04:00
Chompstation Bot
4090222cda Janitor Equipment Fix 2021-08-01 14:45:35 +00:00
Nadyr
3f19639e03 powder that makes you say yes 2021-07-28 18:58:49 -04:00
Chompstation Bot
d4c6afa5af Remove atom/Uncross override 2021-07-28 20:43:23 +00:00
Aronai Sieyes
5d6d45904d Merge pull request #11259 from VOREStation/Arokha/dropfix 
AAAAAA
 2021-07-26 21:24:07 +00:00
Chompstation Bot
f97dfc5dea More TGMC Ports 2021-07-25 21:45:48 +00:00
Nadyr
03e7614962 Merge pull request #2650 from CHOMPStationBot/upstream-merge-11229 
[MIRROR] [MIRROR] Sign Oh Sure
 2021-07-25 02:42:24 -04:00
Nadyr
871550539f Merge pull request #2648 from CHOMPStationBot/upstream-merge-11227 
[MIRROR] Improve admin spawn features
 2021-07-24 23:52:07 -04:00
Chompstation Bot
3e3d82a363 [MIRROR] Sign Oh Sure 2021-07-24 18:12:50 +00:00
Chompstation Bot
8b01c674d0 Improve admin spawn features 2021-07-24 17:05:36 +00:00
Chompstation Bot
6280067d11 New Rack and Wardrobe 2021-07-24 16:42:54 +00:00
Nadyr
0872aa5719 powder that makes you say yes 2021-07-24 00:29:55 -04:00
Chompstation Bot
7714b9c393 Angled wall bits 'n bobs 2021-07-23 22:51:32 +00:00
Nadyr
cae6dc6f04 Merge branch 'master' into upstream-merge-11213 2021-07-22 19:18:04 -04:00
Chompstation Bot
c296437dc1 Angled wall tweaks 2021-07-22 21:58:13 +00:00
Chompstation Bot
1372d838e1 Port Bay and Eris walls 2021-07-22 20:29:32 +00:00
Nadyr
2ac3993558 Merge pull request #2617 from CHOMPStationBot/upstream-merge-11179 
[MIRROR] Optimize a couple things
 2021-07-20 21:45:26 -04:00
Nadyr
4cb45618a0 powder that makes you say yes 2021-07-20 21:06:36 -04:00
Nadyr
b48ecdbc98 Merge pull request #2601 from CHOMPStationBot/upstream-merge-11112 
[MIRROR] Xenomorph Overhaul and fixes from Gurgstation
 2021-07-20 21:04:13 -04:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Aronai Sieyes
442c888d5e Merge pull request #11181 from VOREStation/Arokha/farpaint 
Add art possibility to Virgo 2 surface outpost
 2021-07-20 21:30:04 +00:00
Chompstation Bot
b85c5de137 Xenomorph Overhaul and fixes from Gurgstation 2021-07-20 01:06:44 +00:00
Nadyr
5c7226fa54 Merge branch 'master' into upstream-merge-11110 2021-07-16 19:09:43 -04:00
Chompstation Bot
d0d23ed393 Fixes a bunch of bools missed in #11100 2021-07-16 21:12:20 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
951d4b303f Merge pull request #2528 from CHOMPStationBot/upstream-merge-11032 
[MIRROR] Add a lot of clothes/armor/suits/spacesuits/rigs
 2021-07-15 19:07:37 -04:00
Chompstation Bot
b974746755 Add a lot of clothes/armor/suits/spacesuits/rigs 2021-07-14 22:44:11 -04:00
Aronai Sieyes
bb6f219db6 Merge pull request #11073 from VOREStation/Arokha/connless 
Make connections lists lazy
 2021-07-14 18:37:22 +00:00
Nadyr
19b0e94af7 Merge pull request #2510 from CHOMPStationBot/upstream-merge-11025 
[MIRROR] Fix crafting menu, add plant fiber crafting things
 2021-07-13 22:59:04 -04:00
Chompstation Bot
50dd8ad121 Fix crafting menu, add plant fiber crafting things 2021-07-11 19:16:38 +00:00
Chompstation Bot
d9cb00a124 Add skybox planet sprite for Virgo3b, modify midpoint 2021-07-10 23:48:50 +00:00
Nadyr
49866902a7 Merge pull request #2479 from CHOMPStationBot/upstream-merge-10980 
[MIRROR] Expands do_after/do_mob exclusive var to affect target
 2021-07-10 01:30:52 -04:00
Nadyr
d9dd108539 Merge pull request #2466 from CHOMPStationBot/upstream-merge-10963 
[MIRROR] Byond will never stop with this huh
 2021-07-10 00:45:05 -04:00
Nadyr
2cad763c26 Merge pull request #2447 from CHOMPStationBot/upstream-merge-10852 
[MIRROR] Use material defines more
 2021-07-09 23:22:03 -04:00
Aronai Sieyes
f835374f26 Merge pull request #10980 from MarinaGryphon/issue/8289 
Expands do_after/do_mob exclusive var to affect target
 2021-07-09 16:14:12 +00:00
Aronai Sieyes
22e6adb253 Merge pull request #10963 from VOREStation/Arokha/artREALLY 
Byond will never stop with this huh
 2021-07-08 04:54:26 +00: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
70fcf38987 powder that makes you say yes 2021-07-07 23:58:56 -04:00
Nadyr
8b67f6b69d Merge pull request #2451 from CHOMPStationBot/upstream-merge-10949 
[MIRROR] More painting tweaks
 2021-07-07 23:56:53 -04:00
Nadyr
21aa0be248 Merge pull request #2444 from CHOMPStationBot/upstream-merge-10938 
[MIRROR] Art removal tweaks
 2021-07-07 23:52:59 -04:00