cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-14 03:14:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,137 Commits 8 Branches 0 Tags
bdf7cff2232ebd1300ec8d898aaa763f8faf3bcb
Commit Graph

404 Commits

Author SHA1 Message Date
Novacat
b291d87e18 Merge pull request #11387 from Heroman3003/dupefix 
Fixes infinite material duplication in R&D
 2021-08-11 02:51:43 +00:00
Nadyr
9152417438 powder that makes you say yes 2021-07-29 18:58:35 -04:00
Chompstation Bot
ae737fe4a1 Add arcadey carpets 2021-07-29 20:10:19 +00:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr
60fa095962 Merge pull request #2488 from CHOMPStationBot/upstream-merge-10993 
[MIRROR] Stack Examine Improvements, Log Examine Fix
 2021-07-10 01:47:29 -04: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
Aronai Sieyes
205ef740bd Merge pull request #10993 from MarinaGryphon/issue/logpile 
Stack Examine Improvements, Log Examine Fix
 2021-07-09 16:19:16 +00: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
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Chompstation Bot
14129d60cf Converts visible_message notice spans to look more like emotes 2021-07-05 20:30:12 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
a94e471add Material Container Component & Autolathe QoL 2021-06-13 03:18:30 +00:00
Nadyr
ce20d09e0c Merge pull request #2054 from CHOMPStationBot/upstream-merge-10433 
[MIRROR] [MIRROR] Linter Introduction + Cleanup
 2021-05-27 21:35:05 -04:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
d52c1e61e8 Aro shipself v3 2021-05-27 01:10:08 +00:00
Chompstation Bot
fd5b2f094f [MIRROR] Moves material stacks to modules/materials 2021-04-28 16:38:58 +00:00
Chompstation Bot
0001021815 [MIRROR] Tanning Tweaks 2021-03-30 20:55:26 +00:00
Razgriz
6e171d3182 Merge pull request #1536 from CHOMPStationBot/upstream-merge-9396 
[MIRROR] [MIRROR] Matter Matters
 2021-03-16 22:22:28 -07:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Chompstation Bot
9270659dbb [MIRROR] Matter Matters 2021-03-09 20:42:39 +00:00
cadyn
14c7647f5f Update tile_types.dm 2021-02-27 14:53:42 -08:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Razgriz
f97d065119 Update tile_types.dm 2021-01-27 18:13:46 -07:00
Razgriz
8f0f6f804b Update fifty_spawner_tiles.dm 2021-01-27 18:13:25 -07:00
Chompstation Bot
0967736254 [MIRROR] Fixes sif forest grass, adds overgrowth tiles 2021-01-27 19:35:43 +00:00
cadyn
3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug 
Vore slug and forest turf fix
 2021-01-24 08:46:49 -08:00
Darlantan
a2f77d1eb1 Fixes Sif forest turfs 2021-01-24 11:02:43 -05:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
32f728a713 Merge pull request #9572 from VOREStation/upstream-merge-7824 
[MIRROR] Sheet Recipe Unexclusivity.
 2021-01-14 18:05:02 +00:00
Novacat
cd1ad32cb2 Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-08 03:38:26 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Verkister
7d408e9996 Merge pull request #9227 from VOREStation/upstream-merge-7714 
[MIRROR] Adds sifgrass floor tiles. Grass tiles spawn greengrass
 2020-10-19 10:39:13 +00:00
Cadyn
1d0e69633f Fix silly stuff 2020-10-05 19:46:50 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Cerebulon
95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
735230d642 TGUI Metal Menu (Travis stop it) 2020-09-11 21:21:50 -07:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Razgriz
6bb324fd55 fix comment compile error 2020-07-13 03:08:46 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Izac Joof Forsgren
cf891ce999 Update code/game/objects/items/stacks/tiles/tile_types.dm 2020-07-04 08:26:15 +02:00
Luke Vale
8221cbc4ad Adds in the files because I'm a dummy 2020-07-04 01:25:23 -05:00
Luke Vale
2098a55ae7 Adds in the other carpet types as a buyable crate. 2020-07-04 01:18:26 -05:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
Aronai Sieyes
ea8c29acc8 VS: Dogborg clotter 2020-05-27 16:44:37 -04:00