Commit Graph

47 Commits

Author SHA1 Message Date
Darius
ad0239b5de Replace all modular HTML spans with defines spans
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
2023-01-16 04:05:27 -05:00
Darius
64ef8148c8 Plushmium crate updates
- Reduces the amount from 30 to 5
- - Allows converting only one plushie per shipment
- Adds a spray bottle variant
- Prevents using the spray bottle on non-plushies
- Adds a boxed set for the items
- Adds a lore note explaining how to use it
- Updates shipment information
2023-01-13 21:40:21 -05:00
Darius
c8acb8c218 Adds a Plushmium Crate to cargo
Adds the new Plushmium Crate, which contains a bottle of Plushmium and a plushie choice box. Also adds an item for the Plushmium Bottle, so it can be in the crate.
2023-01-10 14:28:51 -05:00
BongaTheProto
560c837469 follow-up (aka snap rbmk)
Except for the parts they didn't port over
9cdaffc417
2022-09-18 23:43:45 -05:00
Pin-alternative
9ba41fb085 Merge remote-tracking branch 'upstream/master' into cursed 2022-08-15 07:55:25 +10:00
Pin-alternative
4ad46f4f5f Merge remote-tracking branch 'upstream/master' into cursed 2022-08-08 08:04:31 +10:00
BongaTheProto
509b8df511 Modularize everything
this seems to be working I thibk
2022-08-06 17:35:53 -05:00
BongaTheProto
960fe53353 Update weapons.dm 2022-08-06 12:50:12 -05:00
Pin-alternative
55068b24f0 Merge remote-tracking branch 'upstream/master' into cursed 2022-06-30 14:55:06 +10:00
BongaTheProto
1aa6c8f217 beanb 2022-06-28 15:07:09 -05:00
Pin-alternative
7f4f83e082 needed changes 2022-06-25 20:43:09 +10:00
BongaTheProto
5b996fa2ca Merge pull request #368 from NopemanMcHalt/goners_holster
Allows trencher's coat to hold some extra items (Suggestion 1913)
2022-06-12 13:26:28 -07:00
AshTheDerg
a454eef1d1 Modular PC Vendor
Vendor resupply pack for Modular PC Vendor
2022-06-09 07:54:16 -04:00
Anonymous
1675e6451c Adds ability for trencher's coats to equip...
...extra stuff on them. This increases cost for the crates, however.
2022-06-07 13:03:51 +03:00
AshTheDerg
ebbecca28a Plague Doc Expansion 2022-06-03 05:52:43 -04:00
Anonymous
115795928b Adds real trencher outfits to cargo
Prices are not final... But neither are armor values.
2022-05-30 09:00:30 +03:00
BongaTheProto
d151f761e7 some adds 2022-05-18 19:18:08 -05:00
BongaTheProto
8652fc82a9 was less than I thought
yeah this works ig
2022-05-09 17:33:28 -05:00
BongaTheProto
557fbe7803 back home
this works apparently...?
2022-04-18 21:19:35 -05:00
radar651
32b065eeb1 Luger fix
Fixes the luger
2022-04-05 05:55:24 -05:00
radar651
076e12a829 Ready
Ready for test merg
2022-04-04 16:20:45 -05:00
radar651
069ec135bc Damnit Sandstorm
Sandstorm broke it, I unbroke it
2022-03-29 19:28:28 -05:00
radar651
b2e58b0681 Fixes
Adjust some RNG tables and location of some thigns not being in the Syndi section when they are suppose to be.
2022-03-28 17:54:56 -05:00
radar651
e810701021 Balance
God I love balancing /s
2022-03-27 20:06:04 -05:00
radar651
f816373439 Ready for merg
At least I hope so
2022-03-26 05:21:06 -05:00
radar651
57c913a1db Merge branch 'master' into cargonia 2022-03-24 10:39:30 -05:00
radar651
d01a0c9d7c HOly shit
I am doing a lot
2022-03-24 09:48:55 -05:00
BongaTheProto
5c6ee5c134 Update misc.dm 2022-03-23 07:31:00 -05:00
BongaTheProto
0c9960bf60 Revert "CL didn't fucking compile, who would've thought"
This reverts commit 201f716245.
2022-03-20 01:36:58 -05:00
BongaTheProto
201f716245 CL didn't fucking compile, who would've thought
at least give it a timer or wait for the workflow to end ffs
2022-03-20 01:36:52 -05:00
BongaTheProto
b08642d47b adds corpus gear to cargo 2022-03-20 01:18:41 -05:00
BongaTheProto
7fd3b4e6f4 Merge branch 'master' into sploinky-2 2022-03-19 12:27:51 -05:00
BongaTheProto
0cf2380431 Even more
https://github.com/quotefox/Hyper-Station-13/pull/1513
https://github.com/quotefox/Hyper-Station-13/pull/1515
https://github.com/quotefox/Hyper-Station-13/pull/1547
https://github.com/quotefox/Hyper-Station-13/pull/1548

still gotta look into:
https://github.com/quotefox/Hyper-Station-13/pull/1511
2022-03-18 19:11:11 -05:00
The-Sun-In-Splendour
f4082d74d9 Update goodies.dm 2022-03-18 00:15:22 +01:00
BongaTheProto
3af3c2d663 A lot
https://github.com/quotefox/Hyper-Station-13/pull/621
https://github.com/quotefox/Hyper-Station-13/pull/421
https://github.com/quotefox/Hyper-Station-13/pull/1405
https://github.com/quotefox/Hyper-Station-13/pull/698
https://github.com/quotefox/Hyper-Station-13/pull/853
https://github.com/quotefox/Hyper-Station-13/pull/1147
https://github.com/quotefox/Hyper-Station-13/pull/440
https://github.com/quotefox/Hyper-Station-13/pull/457
https://github.com/quotefox/Hyper-Station-13/pull/1174
https://github.com/quotefox/Hyper-Station-13/pull/1221
https://github.com/quotefox/Hyper-Station-13/pull/424
https://github.com/quotefox/Hyper-Station-13/pull/934/files
2022-03-13 02:00:58 -05:00
CloverIsLucky
dcb1b87597 Found a typo error.
Replaced the Bruhnaris typo to Nanotrasen... As intended.
2022-03-05 21:38:28 -06:00
BongaTheProto
8badaaf8ec the thing
the
2022-03-04 19:51:12 -05:00
radar651
f1ca72a823 Prioty Push
Priorty update due to exploits. Even by an admin at this point.
2022-02-28 13:00:11 -06:00
radar651
e25ba06a1c Removes the antuiqe
Removes the copy
2022-02-26 13:30:00 -06:00
radar651
6080145e15 final updates
Final updates before PR
2022-02-25 18:58:49 -06:00
radar651
2b7ba387f8 Guns guns guns
Lots of guns and some knives
2022-02-25 13:55:13 -06:00
radar651
9c211fe40b I am mad I have to even do this
Like really mad.
2022-02-20 14:01:07 -06:00
BongaTheProto
4024b20c39 Merge pull request #191 from SPLURT-Station/this-will-soon-be-a-cum-nuke
Ports RBMK
2022-02-17 03:32:54 -05:00
BongaTheProto
6b429a0843 I'm waking up
to ash and dust
I wipe my ass and I slap my nuts
2022-02-13 13:02:42 -05:00
radar651
4350a1fd6d Jobs and Holster Update 2
A massive job update, some buffing, some nerfing, some new things
2022-02-09 15:34:58 -06:00
radar651
13f0c2c70b .45 Caliber Update 2
The second update to .45 Caliber pistols
2022-01-24 11:54:09 -06:00
radar651
e2720e4146 UPdate 48 updated
An update to 48
2022-01-18 20:10:59 -06:00