Commit Graph

80 Commits

Author SHA1 Message Date
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
8516b07eee please do not end your paths with / 2024-03-13 14:43:40 -03:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
SandPoot
695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Lin
1adbf914c2 Merge pull request #15414 from BlueWildrose/wingport
TG wing ports with some Citadel additions. All species can now use the flight potion and grow (unique) wings.
2022-02-21 00:02:21 +00:00
Cognition
318240bdc6 TG wing port - Now YOU TOO, can be an "angel" 2021-12-07 18:59:07 -07:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
zerothebigboy
3c60632312 spiteful 2021-09-14 11:01:20 -04:00
Letter N
021b28a2b7 cleanup
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Timothy Teakettle
1b99cb9201 everything has the bonesetter 2020-07-19 18:32:44 +01:00
Timothy Teakettle
974b80a2fd Merge branch 'master' into wound-port 2020-07-18 21:45:24 +01:00
kappa-sama
c39a517519 nerf this 2020-07-18 03:47:31 -04:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Timothy Teakettle
0a4a0fadb3 snails 2020-07-14 20:59:25 +01:00
kevinz000
10944d1b52 The bag of holding (and I guess backpack) balancing pass no one asked for (#11864)
* Ok

* whew

* ok

* fix

* ehh

* fix

* buff disks

* Update _compile_options.dm

* Update tgstation.dme
2020-05-15 03:44:56 +02:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Seris02
b8e8a81d1c there 2020-03-16 20:49:10 +08:00
Seris02
5a04b43db4 duffel baaaaaaaaaaags 2020-03-14 16:12:17 +08:00
necromanceranne
5c2e244ee0 Ports /tg/ pr #44529, reverts #9092 2020-02-16 22:20:50 +11:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
nik707
63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed
the one where the combat medic kit gets buffed
2019-12-19 14:11:27 -06:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
Ghommie
3fb485c721 Fixes the incongruent bone satchel description. 2019-12-03 22:39:07 +01:00
Trilbyspaceclone
96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone
5e1ab01733 What do you mean I cant hold the armory on my back?
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
2019-11-08 21:05:30 -05:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
2019-10-01 00:12:32 -07:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
2019-09-28 03:22:17 -05:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
kevinz000
ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212
gives drones a RPD
2019-08-21 08:15:08 -07:00
Trilbyspaceclone
d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188
Reblances bone satchles
2019-08-18 23:39:39 -07:00
Trilbyspaceclone
906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00
lolman360
2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
Ghommie
8c1e6ff66a Thanks for pointing that out, lolman. 2019-07-01 09:24:35 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Trilbyspaceclone
7830b27b07 Update backpack.dm 2019-06-26 19:27:22 -04:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669)
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
2019-06-23 06:00:27 -07:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164
Adds implanter and implanter cases to syndie surgery bags
2019-06-08 01:21:28 -07:00
Trilbyspaceclone
03132569a7 Update backpack.dm 2019-06-05 15:54:51 -04:00
Trilbyspaceclone
5d80fb6811 Update backpack.dm 2019-05-30 15:04:45 -04:00
Sishen
c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938)
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2019-02-08 05:26:42 -08:00
nik707
2aa0eb2d1b different nerf 2018-09-04 16:31:35 -05:00
nik707
4b6398cfa9 nerfs smuggler satchels 2018-09-03 22:58:08 -05:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362)
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
2018-07-20 03:40:39 -07:00