shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,602 Commits 5 Branches 0 Tags
9217fcc7dc919ab080fa2a8dab113dfcbe73a1eb
Commit Graph

55 Commits

Author SHA1 Message Date
Hatterhat
3ea2c35832 mismatch 2022-12-23 02:25:26 -06:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
shellspeed1
3dace329be adds public bounty consoles without inflation, also removes the mint 2022-09-17 19:27:40 -07:00
BlueWildrose
f235839351 Adds carcinisoprojection jelly, a limb regrowth chem that is made from slime mutation toxin & blood (#15053) 
* Limb regrowth chem, new disease of crab cancer

* Limb regrowth adjustments

* oops, sorry linters.

* oh right this would probably fuck with dullahans

* woops missed a newline

* Update code/modules/reagents/chemistry/reagents/medicine_reagents.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>

* just realized this check is unnecessary.

* let's add a mood debuff while we're at it

* Update medicine_reagents.dm

* add a bounty

* misspelling

* Update crabcancer.dm

Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2022-04-15 00:37:08 +02:00
SandPoot
a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Putnam
86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07:00
necromanceranne
2368968c66 Ports #42721 which happened to resolve this already 2021-03-26 08:45:14 +11:00
Letter N
021b28a2b7 cleanup 
shitcode - b - gone
 2021-01-20 11:08:21 +08:00
silicons
803bff4e5f funny 2020-11-12 23:34:42 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
Ghommie
30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Trilbyspaceclone
899c5a4575 Corrects evey storge with storage (#12220) 
* Update medical.dm

* Update autobottler.dm

* Update autobotter_designs.dm

* Update medical_designs.dm

* Update hardsuit.dm

* Update code/modules/cargo/bounties/medical.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-05-13 21:21:11 +02:00
Putnam
8458f97692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-05-12 13:34:31 -07:00
Putnam
e8d7da56f4 Ported C++mos from yogs (help me) 2020-05-11 15:44:26 -07:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
Trilbyspaceclone
9bf84aca32 grammar 2020-04-09 13:18:55 -04:00
Trilbyspaceclone
8e64664295 Update science.dm 2020-04-07 03:45:23 -04:00
Trilbyspaceclone
45892cef79 Update science.dm 2020-04-03 23:33:15 -04:00
keronshb
42fda3d88b CogChamp 
Adds the CogChamp drink!  Bloodcult gets one so why not Clock?
 2020-02-10 21:18:51 -05:00
Trilbyspaceclone
9466b0f4ca Merge branch 'master' into glassware 2020-01-23 13:31:04 -05:00
Winter Flare
3d85499919 Requested Changes + Nerf 
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
 2020-01-23 07:20:22 -05:00
Winter Flare
c273853cff Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks 2020-01-19 15:25:23 -05:00
Winter Flare
cf9d3977b8 Reward Fix 2020-01-19 15:25:20 -05:00
Winter Flare
5d4732ed30 Update assistant.dm 2020-01-18 22:36:20 -05:00
Winter Flare
703fe9399a Some more balance and a fix. 2020-01-18 22:29:21 -05:00
Winter Flare
bd30b44919 Bounty Reorganisation and Rebalance 
Reorganises several bounties.
Rebalances or Buffs Skateboard, Stunprod, Shady Jims, Gas Mask, Soup, Ice Cream Sandwiches, Popcorn, Onion Rings, Night Vision Goggles, Tool Belts, possibly others.

Moves:
Khinkali to Chef Bounties
Super Bite to Chef Bounties
Poppy Pretzels to Chef Bounties

Adds:
Fiesta Skewer Bounty
Pneumatic Cannon Bounty
BBQ Ribs Bounty
Add's Trillby's Toy Sword Bounty

Fix:
Shady Jims were unobtainable, they are now obtainable.
 2020-01-18 21:59:03 -05:00
TrilbySpaceClone
92dc5e61c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware 2020-01-13 03:42:20 -05:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
TrilbySpaceClone
e5c8f7bf06 Merge branch 'master' into glassware 2019-12-07 12:50:32 -05:00
Trilbyspaceclone
82ab55453b Apply suggestions from code review 
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
 2019-12-01 20:57:13 -05:00
Winter Flare
eee8c8c108 Shields Bounty is now 2 for 3000 2019-11-23 03:11:00 -05:00
Winter Flare
03dae580a9 Minor QoL and Wardrobe Updates 2019-11-22 14:08:12 -05:00
TrilbySpaceClone
a3aa70be75 Tweaks, and such 
Tweaks many cargo packs, and fixes a few issues
Sneak peak into the kilm as well
 2019-11-20 06:02:06 -05:00
Winter Flare
4b6d9848ff Update assistant.dm 2019-11-05 01:44:15 -05:00
Winter Flare
74b5961a8d Removed an unneeded line, added gas masks 2019-11-05 01:43:38 -05:00
Winter Flare
87695c0a21 Moved some stuff around, added some more. 
Moved Strange Objects and Sunglasses into silly.dm, modified a few of the bounty prices.
 2019-11-05 00:22:22 -05:00
Winter Flare
eb5f014382 Travis is mean. 2019-11-01 05:24:20 -04:00
Winter Flare
7a9f48302d Reworked a bit of bounty stuff. 2019-11-01 01:38:27 -04:00
Trilbyspaceclone
e4a2c21b8c Merge branch 'master' into Cargo_rebalance 2019-10-08 18:49:38 -04:00
Trilbyspaceclone
bacd0d39de recomplie 2019-10-01 20:56:01 -04:00
TrilbySpaceClone
d37cb76f42 part 3 2019-08-28 21:18:51 -04:00
TrilbySpaceClone
0e5ddc88c1 Part 2 
bounty nerfs
 2019-08-28 19:51:07 -04:00
TrilbySpaceClone
db317b65af Grand! 2019-08-24 19:39:15 -04:00
BlackMajor
dbe50db261 Merge pull request #8349 from Trilbyspaceclone/patch-124 
Removes Nitryl bounty but adds 7 more in!
 2019-08-19 20:07:40 +12:00
Trilbyspaceclone
9f2b91b2e9 Apply suggestions from code review 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-18 12:24:40 -04:00
Trilbyspaceclone
050906bfe8 I know how to code I sware 2019-05-12 22:22:09 -04:00
Trilbyspaceclone
e9a18f156f Update engineering.dm 2019-05-12 22:03:21 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00