76 Commits

Author SHA1 Message Date
evilew 9d9f805d7b Merge branch 'master' into gatofication2 2024-11-21 22:11:24 +01:00
evilew b251055c6e bluespace tray buff
from 50 to 100
2024-11-21 01:05:42 +01:00
evilew bdccf133cb load of fixes
- increased age_min from 18 to 21
- gave RCDs an option of airlock direction
- buffed bluespace trays
- made more windows / walls directional and merging with airlocks/windows
- gave the rusty walls perspective sprites
- removed stoner language from beach bum
- enabled prisoner (for now)
- buffed HEVA not to be weak to goliaths
- brought back smaller, more realistic bee sprites
2024-11-20 15:51:04 +01:00
evilew 10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
shellspeed1 3735efbfca Ports construction bags 2020-11-29 18:29:03 -08:00
The0bserver e40e4a79d3 Allows plantbags to hold plantdisks 2020-10-10 08:58:54 -04:00
silicons f99a0564de Merge pull request #12693 from Owai-Seek/trashbag-7-4-20
Trashbag Whitelist Update
2020-07-11 21:28:12 -07:00
Winter Flare 767290d8e9 Trashbag Whitelist Update
Trashbag can now hold:
All Organs
Most Shoes

Trashbags cannot hold:
Jackbooks
Workboots
Clown Shoes
Nuke Disk
Wallets (Nuke Disk Nesting)
Brains
2020-07-04 21:03:31 -04:00
Timothy Teakettle 15e137dd18 Merge branch 'master' into tray-and-jar 2020-07-01 22:06:17 +01:00
Timothy Teakettle 8a0ab009dd give trays better capacity 2020-07-01 22:05:14 +01:00
timothyteakettle 2e4c5e322d tray and jar 2020-06-29 02:49:31 +01:00
b1tt3r1n0 a780b9037c Some edits to pouches, and something that can hold sheets.
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
2020-06-24 23:07:56 -04:00
silicons 99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems
Ports IV bags from TG
2020-06-21 14:11:10 -07:00
shellspeed1 b490f02c78 Ports IV bags from TG
Ports the iv bag portion of https://github.com/tgstation/tgstation/pull/44531/files from tg.
2020-06-18 02:30:58 -07:00
b1tt3r1n0 764ba26ace Pouches (#12432)
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
2020-06-09 03:22:39 -07:00
Ghom 48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392)
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
2020-05-31 00:54:28 -07:00
Sonic121x 807a5c7d1e Fix stuff that no one care about (#12340)
* Update bags.dm

* Fix instant crush

* tweak frame delay

tweak the 3 variant of shutters frame delay to 0.38 per frame,make it took roughly 10 tick to close completely.
2020-05-23 14:48:39 +02:00
TrilbySpaceClone 25b1b889dc amazing truely amazing 2020-04-19 19:09:20 -04:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
kevinz000 8b0b685fa7 CHECK_MOBILITY 2020-03-03 20:40:33 -07:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom f86e17d945 Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
2020-02-24 20:53:36 +01:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Winter Flare 79967b0ac5 Resolving some convos.
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
2020-02-21 07:16:39 -05:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Winter Flare bb641fecf8 Sprites, Tweaks, and Snacks
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00
Putnam3145 b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie 4cc0833b28 Fixing an edge case runtime with ore bags. 2020-01-06 01:45:53 +01:00
BlackMajor 62b3c1e65b Makes pick up range work 2019-12-30 02:28:23 +13:00
BlackMajor b811d3e57e More work on it 2019-12-30 01:23:41 +13:00
kevinz000 d7e8b5209f Update bags.dm 2019-10-27 20:36:32 -07:00
kevinz000 2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
2019-10-24 18:38:39 -07:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00