Heroman3003
13c8f6a7bd
Merge pull request #14725 from VOREStation/upstream-merge-8950
...
[MIRROR] Fixing Tape Recorder Voices
2023-06-04 07:10:15 +10:00
Heroman3003
2a3d1c14b0
Update taperecorder.dm
2023-06-04 07:02:30 +10:00
Heroman3003
78a8ef9563
Merge pull request #14957 from Youtubeboy139/hedge-trimmers
...
Fixes #14956
2023-06-04 05:13:10 +10:00
Heroman3003
9983fc2447
Merge pull request #14821 from Youtubeboy139/2023-EnerGen-Power-Cells
...
2023 EnerGen Power Cells
2023-06-04 05:09:19 +10:00
Youtubeboy139
d4d86a2c31
Hydroponics Fix
2023-06-03 15:00:06 -04:00
Heroman3003
b22b9e6e48
Merge pull request #14936 from ItsSelis/selis-weakrefs
...
Little Weakref Refactor
2023-06-03 19:21:17 +10:00
Heroman3003
935b5c939c
Merge pull request #14931 from Youtubeboy139/hydro_changes
...
Items for the Plant People (not the literal plant people)
2023-06-02 10:33:01 +10:00
Heroman3003
fc7c783c22
Merge pull request #14916 from Youtubeboy139/medical_mayhem
...
Medical Mayhem
2023-06-02 04:50:59 +10:00
Heroman3003
2a8f646018
Merge pull request #14912 from Youtubeboy139/Thaler-Change
...
It's all bout that Money Money Money
2023-06-02 04:50:34 +10:00
ItsSelis
0680645556
Weakref refactor
2023-06-01 20:31:54 +02:00
Youtubeboy139
f41ff986ff
New Hydroponic Items/Sprites
2023-05-31 22:12:32 -04:00
Youtubeboy139
3818dc1255
New Medical Items
2023-05-31 17:17:40 -04:00
Youtubeboy139
b052a4c418
New Thalers
2023-05-31 02:18:01 -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
lm40
914e4fecaa
Merge branch 'VOREStation:master' into master
2023-05-28 12:37:21 -04:00
lm40
6a67c9c8f6
No spawning maws or asses.
2023-05-28 12:36:55 -04: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
Killian
058c57a299
fix merge conflict, add dept gorkas to selectors
2023-05-25 01:03:17 +01:00
Heroman3003
df699feabc
Merge branch 'master' into kk-nanofix
2023-05-25 09:55:05 +10:00
Heroman3003
415d9591dc
Merge pull request #14891 from KillianKirilenko/kk-tgfashion
...
Dept. Gorka Suits
2023-05-25 09:49:29 +10:00
Heroman3003
2356c2e6a4
Merge pull request #14889 from KillianKirilenko/kk-batontweaks
...
Baton Safety Tape
2023-05-25 09:48:57 +10:00
Killian
0fb46b59a3
tg clothing polish
2023-05-24 19:59:31 +01:00
Killian
b06da3aa06
gorkamorka
...
more gorka suits
2023-05-23 17:19:59 +01: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
Detective-Google
8dbc9caac2
Merge remote-tracking branch 'upstream/master' into clothes
2023-05-19 22:19:49 +01:00
Detective-Google
f8fb3a13f9
adds overwear + makes most of the clothing obtainable.
2023-05-19 02:06:34 +01: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
Youtubeboy139
9f625e65d5
Base Commit
...
Minor Fixes
Found some errors while testing. Fixed.
Minor Fixes
Found some errors while reviewing code. Fixed.
Minor Fixes
Found some errors while reviewing sprites. Fixed.
Major Changes
New Cell Charger icon_update system
New Crap Device Cell
Removes Secborg power cell
Minor Fixes
Found some errors while reviewing code. Fixed.
2023-05-04 12:48:28 -04: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
68acecf26b
ion beam redux
2023-04-21 18:33:37 +01: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
