9bf84aca32
grammar
2020-04-09 13:18:55 -04:00
8e64664295
Update science.dm
2020-04-07 03:45:23 -04:00
45892cef79
Update science.dm
2020-04-03 23:33:15 -04:00
42fda3d88b
CogChamp
...
Adds the CogChamp drink! Bloodcult gets one so why not Clock?
2020-02-10 21:18:51 -05:00
9466b0f4ca
Merge branch 'master' into glassware
2020-01-23 13:31:04 -05:00
3d85499919
Requested Changes + Nerf
...
Nerf cannabis bounties, comment out monkey cube bounty, change to shady jims.
2020-01-23 07:20:22 -05:00
c273853cff
Merge branch 'bountytweaks' of https://github.com/Owai-Seek/Citadel-Station-13 into bountytweaks
2020-01-19 15:25:23 -05:00
cf9d3977b8
Reward Fix
2020-01-19 15:25:20 -05:00
5d4732ed30
Update assistant.dm
2020-01-18 22:36:20 -05:00
703fe9399a
Some more balance and a fix.
2020-01-18 22:29:21 -05:00
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
92dc5e61c3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
2020-01-13 03:42:20 -05:00
e74339ce8b
Jfc that's a lot of work!
2019-12-23 04:24:13 +01:00
e5c8f7bf06
Merge branch 'master' into glassware
2019-12-07 12:50:32 -05:00
82ab55453b
Apply suggestions from code review
...
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com >
2019-12-01 20:57:13 -05:00
eee8c8c108
Shields Bounty is now 2 for 3000
2019-11-23 03:11:00 -05:00
03dae580a9
Minor QoL and Wardrobe Updates
2019-11-22 14:08:12 -05:00
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
4b6d9848ff
Update assistant.dm
2019-11-05 01:44:15 -05:00
74b5961a8d
Removed an unneeded line, added gas masks
2019-11-05 01:43:38 -05:00
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
eb5f014382
Travis is mean.
2019-11-01 05:24:20 -04:00
7a9f48302d
Reworked a bit of bounty stuff.
2019-11-01 01:38:27 -04:00
e4a2c21b8c
Merge branch 'master' into Cargo_rebalance
2019-10-08 18:49:38 -04:00
bacd0d39de
recomplie
2019-10-01 20:56:01 -04:00
d37cb76f42
part 3
2019-08-28 21:18:51 -04:00
0e5ddc88c1
Part 2
...
bounty nerfs
2019-08-28 19:51:07 -04:00
db317b65af
Grand!
2019-08-24 19:39:15 -04:00
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
9f2b91b2e9
Apply suggestions from code review
...
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com >
2019-05-18 12:24:40 -04:00
050906bfe8
I know how to code I sware
2019-05-12 22:22:09 -04:00
e9a18f156f
Update engineering.dm
2019-05-12 22:03:21 -04:00
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
1995f2d61d
[Ready] More cargo bounties. ( #7955 )
...
* Fixing updater
* Update medical.dm
* Update medical.dm
* ?
* Update engineering.dm
* Update science.dm
* Update security.dm
* Update mining.dm
* Forgot this
* Apply suggestions from code review
Killing rag with grammar
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Apply suggestions from code review
Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com >
* Update science.dm
* Kev requestions
* Fixed?
* even more sec things
* Makes bluespace crystals say the kind they want
* Fixed? And more medical boundys
* Update medical.dm
* Blood fixed?
* Update medical.dm
* Poojawa the saver
* Poojawa the hero
* Update medical.dm
2019-02-22 05:51:01 -08:00
42db44b39e
Alien Ruin fix, various cherrypicked upstream fixes
...
Also adds new buildmode
2018-09-13 22:55:11 -05:00
284e9d0325
module things, jfc
2018-09-11 07:51:01 -05:00
b1688405d9
and finally, the modules folder. Now I can publish and take a break
2018-07-02 01:19:37 -04:00
2f9e3e403d
Hard upstream sync ( #6951 )
...
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync
* sync part 1 - underscore folders in code
* controllers folder
* datums folder
* game folder
* cmon, work
* modules - admin to awaymissions
* cargo to events
* fields to lighting
* mapping > ruins
* rest of the code folder
* rest of the folders in the root directory
* DME
* fixes compiling errors. it compiles so it works
* readds map changes
* fixes dogborg module select
* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
Trilbyspaceclone