shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

59 Commits

Author SHA1 Message Date
Trilbyspaceclone
5ea9d998fd k_elasticity = 0 2019-07-10 18:32:55 -04:00
Sishen
59cf148211 Update large_objects.dm 2019-06-20 20:09:44 -04:00
Sishen
df7f8b8313 Update large_objects.dm 2019-06-20 19:23:47 -04:00
Sishen
0d3efa0abd sell gases to get that fuckin bike 2019-06-20 19:21:12 -04:00
Trilbyspaceclone
4ef2b15c69 Update manifest.dm 2019-06-06 15:51:37 -04:00
Trilbyspaceclone
1aa312822a Sure 2019-04-23 02:34:14 -04:00
Trilbyspaceclone
e61b4f83d8 Update large_objects.dm 2019-04-20 00:37:45 -04:00
Trilbyspaceclone
660703e713 [Ready] Fixes price of Paperwork and makes the not have 2 spare pens (#7969) 
* Update manifest.dm

* Blacklists

* Removes cardboard

* Forgot the comma

* : /
 2019-02-05 18:13:26 -08:00
Ragolution
6ba56c7331 Apply suggestions from code reviewer Rag 
Spell checker

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-01-12 15:06:38 -05:00
Trilbyspaceclone
165967416e Update manifest.dm 2019-01-11 18:07:39 -05:00
Trilbyspaceclone
2a0a57dcd2 Update manifest.dm 2019-01-11 17:56:57 -05:00
Poojawa
b00a76476c Oh hey, all of those compile fixes 2018-09-11 11:00:18 -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
Tlaltecuhtli
51b6a296d3 fixes a money loop 
🆑 
fix: fixes a possible money exploit
/🆑

why: if you buy the barrier crate, open it, spam all the grenades in vertical mode u ll get more money that the crate is worth
before: 4 grenades -> 12 barriers * 375 credits -> 4500 + 500 (crate) + 200 (manifest) -> 5200 which is a +3200 net gain
now:  4 grenades -> 12 barriers * 100 credits -> 1200+ 500 (crate) + 200 (manifest) -> 1900 which is a -100 net loss
 2018-05-09 13:40:13 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
CitadelStationBot
7126b61205 [MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag (#5327) 
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag

* really? Like, a dozen fucking map conflicts. this map was fucked entirely
 2018-02-06 19:06:31 -06:00
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17 
s

s
 2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014) 
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
 2017-12-11 16:36:38 -08:00
deathride58
0f9a85e4d7 Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101 
[MIRROR] Refactor of catpeople mutant organs
 2017-11-21 21:16:31 +00:00
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
ACCount
eb54055278 Refactor of catpeople mutant organs 2017-11-01 21:38:06 -05:00
CitadelStationBot
b13f090fe9 [MIRROR] Adds Lavaland items to weapon exports for cargo (#2836) 
* Adds Lavaland items to weapon exports for cargo (#30403)

They're expensive, but those mobs are quite difficult to kill

* Adds Lavaland items to weapon exports for cargo
 2017-09-17 22:32:53 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530) 
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
 2017-09-10 17:10:45 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
76f7fcef9a [MIRROR] Cleaned up paper varedits + tidied up paths (#2156) 
* Cleaned up paper varedits + tidied up paths

* work smarter, not harder

* citadel snowflake

* Update uplink_item_cit.dm
 2017-08-02 03:17:32 -05:00
CitadelStationBot
2d74f9f45a Fixes a cliffhanger comment 2017-07-31 08:57:56 -05:00
CitadelStationBot
ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
LetterJay
46c3108267 Merge pull request #1772 from Citadel-Station-13/upstream-merge-28749 
[MIRROR] Exporting mechs!
 2017-06-26 06:28:22 -05:00
LetterJay
5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
LetterJay
ed6c0b042e Merge pull request #1508 from Citadel-Station-13/upstream-merge-28227 
[MIRROR] Clown Toy Box + Wooden Crates
 2017-06-26 04:29:08 -05:00
LetterJay
4fff59df02 Update large_objects.dm 2017-06-26 02:35:58 -05:00
CitadelStationBot
e57a753701 Exporting mechs! 2017-06-25 11:35:00 -05:00
CitadelStationBot
35ac6c40e0 Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652) 2017-06-20 07:59:04 -07:00
CitadelStationBot
00a4b5ce8c Fixes 28154: Accidental cargo exploit edition. (#1471) 2017-06-17 13:37:43 -07:00
CitadelStationBot
f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay
35b56f3075 Merge branch 'master' into upstream-merge-27773 2017-06-06 09:05:26 -05:00
LetterJay
bc5ecc91b5 rej clean 2017-05-30 15:55:00 -05:00
LetterJay
3c89f142ed Update materials.dm 2017-05-30 15:17:00 -05:00
CitadelStationBot
afbfb66386 Splits mining_mobs.dm into separate files 2017-05-29 01:17:13 -05:00
CitadelStationBot
20886e15de Nerfs plasma cost 2017-05-24 16:54:14 -05:00
CitadelStationBot
7d04404ae3 [MIRROR] Fixed tech disk exports (#971) 
* Fixed tech disk exports

* Update research.dm

* Delete research.dm.rej
 2017-05-18 11:59:06 -05:00
CitadelStationBot
18607f79a2 Wooden planks now sell for 50 instead of 25 cargo points (#897) 2017-05-10 16:00:59 -07:00
CitadelStationBot
0bbe5a67fa The least surprising nerf: Null Crates & Emagged Plasma Export Bonus 2017-04-29 17:05:17 -05:00