Commit Graph

3788 Commits

Author SHA1 Message Date
Killian
cd7d9482e5 locks & keys 2023-09-19 12:25:54 +01:00
Runa Dacino
1b23ff5cdc tweak: Replaces "Iron" pill bottle with blood regen pill bottle
Replaces instances of "iron" pill bottle with the new blood regen pill bottle in containers and maps that are either NanoTrasen or Zorren related. Keeps iron bottles in other maps (mostly specific away mission rewards)

add: Adds Copper pills, Blood regen pill bottles

30 u copper reagent per copper pill. Blood regen contains 9 iron, 5 copper pills now that zorren need copper for treatment
2023-09-10 16:45:26 +02:00
Heroman
ba7b9f46a6 Adds Entrepreneur job, as well as new Entertainer alt-title 2023-09-01 07:43:55 +10:00
Heroman
db80e2cef1 Removes random burn chance from cheap lighters 2023-08-31 06:47:53 +10:00
Heroman
71e124718e Adds food vore 2023-08-22 20:12:24 +10:00
VerySoft
90981fa620 Revise OOC notes panel
Revises the OOC notes panel a bit, and removes the OOC notes panel from character setup, in favor of just adding buttons to set the likes and dislikes there, rather than maintaining two different versions of the panel.

Additionally, adds a 'print to chat' button to the panel, and to examine for the OOC notes.

Changes the way the window is sent to the client so that it behaves more like character setup. This should mitigate edge cases where the panel appears off screen when SS13 is not being displayed on the primary monitor. It SHOULD also remember its position between sessions. Either way it should stay on your screen now.

Also, for the print to chat, character directory, and any OOC notes panel that isn't yours, the LIKES and DISLIKES sections will show up conditionally depending on if they are actually set up. If there's nothing there, then they won't show up.

This is presently an imperfect revision, as it only allows you to have one OOC notes panel open at a time. I would like you to be able to have more than one at a time, while also having the features to allow it to always appear on the screen, however, that will take some extra development time.

Apart from that, this is fully functional.
2023-08-16 05:44:59 -04:00
Runa Dacino
04c42c29de Tweak: Changes mentions to phoron from nitrogen in manual
Changes mentions of nitrogen to phoron in SM manual.

Also updates relevant numbers (expected shots of 12-16)

Expands data enabled by new features: how many moles in a canister, how to check.

Expands data on SM behaviour by mentioning EPR, gives safe window.
2023-08-11 18:09:20 +02:00
Heroman
9435db8c69 Feature completion for Dogborg Removal 2023-08-09 19:40:36 +10:00
Killian
d8ec7bf887 staves2 2023-07-30 23:47:54 +01:00
Killian
b966afe0a0 staves 2023-07-29 22:08:24 +01:00
Heroman
eade7ffc26 Adds altevian NPCs for event use 2023-07-14 17:38:02 +10:00
Heroman3003
e047e89ba7 Merge pull request #14638 from VOREStation/upstream-merge-9002
[MIRROR] the little construction pr
2023-07-07 17:29:50 +10:00
Heroman
63e9a069be Compatibility fixes 2023-07-07 17:17:49 +10:00
VerySoft
4628e467c2 Tweaks and tidying
Adjusts some types to tidy up the mob list. Put some of the mobs that can vore under the vore tab, removed the clown mobs from /mobs_monsters because they were the only thing in there, so there wasn't really any point in hiding them a level deeper, and generally looked for subtypes that didn't have anything in them, and commented those out. Did you know that telesci is supposed to have a chance to spawn hostile mobs if you mess up? It's true! I may or may not have fixed it, I don't play telesci, but it uses a path that actually has mobs in it now.
2023-07-03 02:09:51 -04:00
Heroman3003
860fad8a75 Merge pull request #15043 from ItsSelis/spell-fixes-v2
Spell Fixes
2023-06-19 14:39:41 +10:00
Selis
271ff9408f Spell Fixes 2023-06-18 12:47:36 +02:00
Youtubeboy139
c8075aa901 New Belts and Accessories 2023-06-17 16:31:45 -04:00
Heroman3003
734171f96b Merge pull request #14961 from Youtubeboy139/Lighters_&_cigs
"Hey bud, need a light?"
2023-06-10 08:42:47 +10:00
Runa Dacino
30cae88d19 Fixes oversight of picnic blankets NOT being anchored
* I assumed all obj/structure start as anchored
* I assumed wrong.
* I need to stop assuming things
* Anyway, bugfix for informal bugreport "throwing items at blankets causes them to get dislodged weirdly."
2023-06-07 18:00:13 +02:00
ItsSelis
10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
Youtubeboy139
bd829ad563 Lighters and Cigs sprite revivals 2023-06-03 21:21:04 -04: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
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
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
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
9606d98f23 Update stunbaton.dm 2023-05-22 19:09:45 +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
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
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