Commit Graph

52 Commits

Author SHA1 Message Date
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
The0bserver 7e92781e93 Improved Cigarette Case Handling 2021-04-21 11:50:41 -04:00
The0bserver c313ba38b8 adds the .38 2021-04-14 01:26:24 -04:00
The0bserver 27c49b3f34 fox fix 2021-04-13 23:38:50 -04:00
The0bserver 64a3cd9404 T. Derringer has twin calibers, Station gets .38 2021-04-13 23:22:35 -04:00
The0bserver 9fe8fb7671 More work 2021-04-11 07:20:06 -04:00
The0bserver e75088420d Error fixing. 2021-04-11 04:38:46 -04:00
The0bserver 55eb445a07 Adds Derringers (Code) Initial Commit 2021-04-11 04:20:12 -04:00
ItzGabby 4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
MrJWhit f5b99b83f8 Fully functional 2020-12-13 02:29:29 -05:00
Ghommie f1c242aadc Fixing new bugs and stuff. 2020-07-27 14:16:01 +02:00
Winter Flare 2effbf4db0 Fixes Spiral, and Cracker Box 2020-07-18 18:53:47 -04:00
Winter Flare d6413d5559 Adds Cracker Box, Soup
Fixes stray pixels on some sushi sprites.
Adds Spiral Soup, Bear Chili
Adds Cracker Box
2020-07-14 22:43:34 -04:00
Ghommie 6fc584518a Fixing (un)equip penalties from obscured inv slots. 2020-07-03 00:07:30 +02:00
Ghommie 29a8d2ed78 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit813 2020-06-20 00:07:47 +02:00
Ghom 8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghommie 495ccc99c5 Porting some cargo/vending updates. 2020-06-08 06:12:51 +02:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Trilbyspaceclone 2039fb80e6 Update fancy.dm 2020-04-18 22:37:05 -04:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Winter Flare bb9066e9cb Food Additions / Butter Bear
Ports the following from TG:
Chicken Nugget Box
Crab Burger, Bisque, French Onion Soup, Crab Rangoo
Butter Bear aka Terrygold

Tweaks Bisque and Crab Rangoo recipie.
Removes Bacon from Exotic Meat crate.
Adds Spider Eggs to Exotic Meat crate.
2020-03-08 14:36:08 -04:00
Ghom d5c2c54f32 Update fancy.dm 2020-02-28 19:14:58 +01:00
Ghommie b5f472c6dd thank you dreamchecker 2020-02-27 01:47:18 +01:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
YakumoChen 4c4fda8091 line ending 2020-01-31 14:14:34 +00:00
YakumoChen 89134d8b30 updates fancy
the boxes actually work now
2020-01-31 08:52:45 -05:00
YakumoChen 1ed4b90e5f update fancy 2020-01-31 07:14:58 -05:00
YakumoChen 065691ca1e adds ring boxes to fancy 2020-01-31 06:33:13 -05:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie 1a2901f197 Ports CEV-Eris matchbox respriting, also respriting cigar boxes. 2019-11-04 16:14:12 +01:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
81Denton 241d0c7a9a Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)
* shit was SO cash

* correct dance machine subtype

* moves defines from map file to corpse.dm

* improves bartender flavor text

* adds special shadycigs for beach ruin, adds shower, moves bartender sleeper to backroom
2018-06-18 09:37:48 -05:00
ShizCalev b7ae796734 Fixes cigar bugs (#38218) 2018-06-03 09:03:59 -05:00
JStheguy a3a0a49b5d Marginal Sprite Improvements Part 2: Cigarette Lighter Boogaloo (#38161)
* the rainbow of mediocrity rides again

* whoops that wasn't supposed to be there

* updated vending machine, burger, and donut sprites

they've all been improved marginally

* edits roborger a bit more

"bun" is flatter, has an antenna that blinks in agony

* does sprite things to lighters and cigar cases

* darkened cigar case interiors

* tweaks lighter flames
2018-06-01 09:53:33 -05:00
deathride58 6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
Mickyan 5596472fc1 fixes midori cigs being empty (#37615) 2018-05-02 17:31:14 -05:00
oranges 7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa cc6b320f83 game folder 2018-04-23 00:17:28 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
TehZombehz 326238e59f Gives eggbox an inhand image, cleans up heartbox inhands 2018-02-15 14:23:48 -06:00
TehZombehz 1346e88e6b Fix for invisible heartboxes 2018-02-13 18:08:38 -06:00
oranges e6ace7bc56 Adds heart-shaped boxes of chocolate to the valentines event 2018-02-13 14:12:32 -06:00
ShizCalev f4685cfe01 [s] Fixes altclick exploits 2018-02-11 05:08:00 -06:00
Jordan Brown 98fb887ccc Merge pull request #31765 from DaxDupont/fancythis
Fixed fancy boxes not showing proper content amount.
2017-10-16 07:15:04 -05:00
oranges bf7f4e6e69 Minor refactor to storage items (#31324)
They now do not call the on exit storage hook when items are being
deleted, as well as do not bother to reset a bunch of values

we now cache the see contents list for a very small speed boost

the fancy storage specific update icon is moved to the fancy storage
equivalent proc
2017-10-08 10:06:51 -05:00
bawhoppen 82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
kingofkosmos f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00