cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 20:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
65,849 Commits 8 Branches 26 Tags
f41ff986ffd5eff94352c8f39c64ef7f4aed679d
Commit Graph

6172 Commits

Author SHA1 Message Date
Youtubeboy139
f41ff986ff New Hydroponic Items/Sprites 2023-05-31 22:12:32 -04:00
Heroman3003
0efb4fef51 Merge pull request #14911 from Runa-Dacino/PicnicBlanket 
Adds a new object: Picnic blankets! They can be folded & unfolded
 2023-05-31 10:40:17 +10:00
Runa Dacino
948cf051d3 Adds new obj type: Picnic blankets! 
*Actually 2 types: one structure (unfolded), one weapon (carried)
*When in carried mode, has a verb to unfold and fill a up to 3x3 area
*Filling is blocked by Dense objects, except for tables.
*Tables follow a special logic: if center turf is a table, acceptable. Otherwise no
*However, if center turf is a table, we no longer accept tableless turfs
*If on table, we set layer just over table. Otherwise, we set it below all objs incl hiding ones
*Also adds a mapper variant that calls fold_out() on unfold() on init
*Mapper variant can be set to be unfoldable
*Creates codersprites for it all. It's "passable"
 2023-05-29 00:56:30 +02:00
Youtubeboy139
e25ce95254 Base Commit 2023-05-27 15:57:52 -04:00
Heroman3003
a8dc9e506e Merge pull request #14900 from Youtubeboy139/better_candy_bars 
Better Candy Bars
 2023-05-27 15:21:11 +10:00
Youtubeboy139
4575bb5e13 Base Commit 2023-05-26 18:30:36 -04:00
Youtubeboy139
9364ea4f2e Base Commit 2023-05-25 20:35:35 -04:00
Heroman
d5c0c30cc2 Adds Aria's medal 2023-05-25 10:43:12 +10:00
Heroman3003
2356c2e6a4 Merge pull request #14889 from KillianKirilenko/kk-batontweaks 
Baton Safety Tape
 2023-05-25 09:48:57 +10:00
Killian
9606d98f23 Update stunbaton.dm 2023-05-22 19:09:45 +01:00
Youtubeboy139
71df4464ab Base Commit 2023-05-21 14:10:57 -04:00
Killian
8c8c24e180 Update stack.dm 2023-05-14 13:37:26 +01:00
Killian
01f56888cd mecha nanopaste repairs fix 2023-05-14 13:27:02 +01:00
Killian
682c4259f3 Merge remote-tracking branch 'upstream/master' into kk-coyotesuit 2023-05-08 14:08:14 +01:00
Killian
e0c1979c45 industrial action 2023-05-08 13:40:00 +01:00
Heroman3003
f60556a28f Merge pull request #14828 from ReoDaProtovali/AgentCardFeedback 
Agent ID Feedback
 2023-05-01 11:28:40 +10:00
ReoDaProtovali
a11375ceb2 Agent ID Feedback 
Agent IDs dont give feedback when scanning access, since antags are Not Real. This should fix that with an edgecase, checking if you're the owner of the card, while also not breaking the intention of having the card's covert functions shown to everyone.
 2023-04-30 20:18:26 -05:00
Heroman
32e5b31259 Adds tacopacks too 2023-05-01 10:38:54 +10:00
Heroman
ffa7b9d3d9 Adds altevian ramenpacks 2023-04-28 15:21:31 +10:00
Killian
8a15515111 Update stunbaton.dm 2023-04-17 14:20:42 +01:00
Killian
43d07e92ae Update stunbaton.dm 2023-04-17 13:52:46 +01:00
Killian
1c1e60c60a Update shock_maul.dm 2023-04-14 09:22:58 +01:00
Killian
3ac69a355c Update shock_maul.dm 
move AP handling as well just to be safe
 2023-04-10 13:39:21 +01:00
Killian
6d026020d7 Update shock_maul.dm 2023-04-10 13:27:17 +01:00
Killian
222f679dae concussion maul pt4 2023-04-10 13:24:17 +01:00
Killian
f1c168faa2 concussion maul pt3 2023-04-10 07:53:15 +01:00
Killian
5c1bdee75e Update shock_maul.dm 
message cleanup
 2023-04-10 01:45:39 +01:00
Killian
6105365066 concussion maul pt2 2023-04-10 01:25:03 +01:00
Killian
ad53fd8f6f concussion maul 2023-04-08 09:24:45 +01:00
Heroman3003
4efbfe4fcb Merge pull request #14662 from KillianKirilenko/kk-wepdesc 
Weapon Info on Examine
 2023-03-15 04:08:50 +10:00
Heroman3003
32e97ebda2 Update mre.dm 2023-03-14 17:59:20 +10:00
Atermonera
9987e78f5a Fixes a raunchy typo 2023-03-14 03:47:24 -04:00
Heroman3003
21acee71bf Merge pull request #14551 from VOREStation/upstream-merge-8962 
[MIRROR] /tg/ era language pass
 2023-03-13 15:23:34 +10:00
Heroman3003
7a5c03bb65 Update toolbox.dm 2023-03-13 15:04:26 +10:00
Heroman3003
cd72de592a Update syndicate_ids.dm 2023-03-13 15:03:55 +10:00
Heroman3003
78ef017052 Update chewables.dm 2023-03-13 15:03:13 +10:00
Heroman3003
446cd0e362 Update AI_modules.dm 2023-03-13 15:02:48 +10:00
Heroman3003
d2bc2ce1b0 Update AI_modules.dm 2023-03-13 15:02:29 +10:00
Heroman3003
aec41a05f5 Update trash.dm 2023-03-13 15:01:24 +10:00
Heroman3003
a236ff66ea Update flash.dm 2023-03-13 14:59:53 +10:00
Killian
d85d9306df melee weapon info on examine 2023-03-12 03:12:21 +00:00
Heroman
a7ac53831f Fixes MRE unpacking and Intercom Convo 2023-03-12 06:41:32 +10:00
Heroman3003
d477c0a044 Merge pull request #14583 from Seris02/adminjumplink 
more fixed admin hrefs
 2023-03-09 15:07:59 +10:00
Seris02
aadd99ba94 more fixed admin hrefs 2023-03-01 11:27:34 +08:00
Heroman3003
922b787c46 Merge pull request #14568 from Seris02/janidrakeplush 
adds more drake plushies, and changes scidrake lights to match sci colors
 2023-02-26 19:45:15 +10:00
Seris02
7fcb9347f9 alt click description and license update 2023-02-26 16:57:14 +08:00
Seris02
cdaaba7386 adds more drake plushies, and changes scidrake lights to match sci colors 2023-02-26 16:33:37 +08:00
Heroman3003
7c690177ac Merge pull request #14533 from VOREStation/upstream-merge-8965 
[MIRROR] Suit kits no longer set item_state on hooded clothes
 2023-02-26 10:58:30 +10:00
Heroman3003
c26c22c9d2 Update flash.dm 2023-02-25 18:17:08 +10:00
Killian
69491d46f2 Merge remote-tracking branch 'upstream/master' into kk-lore 2023-02-25 07:47:02 +00:00