Commit Graph

23 Commits

Author SHA1 Message Date
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01: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
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
Trilbyspaceclone
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
Poojawa
42db44b39e Alien Ruin fix, various cherrypicked upstream fixes
Also adds new buildmode
2018-09-13 22:55:11 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
deathride58
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