shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,049 Commits 5 Branches 0 Tags
3524bc24eaeda23f2ba59ea2aaba6885e305ee21
Commit Graph

79 Commits

Author SHA1 Message Date
kevinz000
178aedc5cc Merge pull request #9754 from Ghommie/Ghommie-cit330 
porting "global to static"
 2019-11-14 16:38:27 -07:00
kevinz000
4c89b8c33f Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII 
[Ready] [Testmerge] MK II Cargo Rework - Sell harder edition
 2019-11-14 16:00:45 -07:00
kappa-sama
6ad9c7fef0 no shotgun i guess 
shit guess i gotta add this to traumas too
 2019-11-13 17:01:30 -05:00
TrilbySpaceClone
73661cfe52 more fixing+ chem selling tweaks 2019-11-13 09:39:42 -05:00
TrilbySpaceClone
ec57e28c17 Merge branch 'master' into Cargo_MKII 2019-11-13 08:00:24 -05:00
TrilbySpaceClone
6e328ea1b1 art of the deal 2019-11-11 07:26:12 -05:00
Ghommie
9591bb5471 porting "global to static" 2019-11-09 22:53:56 +01:00
TrilbySpaceClone
0662245d80 corrections 2019-11-06 22:52:44 -05:00
Trilbyspaceclone
3ab70cbc26 Update sheets.dm 2019-11-03 13:04:48 -05:00
TrilbySpaceClone
a8248c68f4 perhaps 2019-11-03 12:53:02 -05:00
Trilbyspaceclone
4fa6c4d5c0 Apply suggestions from code review 
Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-11-03 11:10:30 -05:00
TrilbySpaceClone
5c4cd15762 Hmm 2019-11-03 11:05:45 -05:00
Trilbyspaceclone
db19eae0f8 Apply suggestions from code review 
Grammar

Co-Authored-By: dapnee <33661984+dapnee@users.noreply.github.com>
 2019-10-27 08:44:46 -04:00
TrilbySpaceClone
63cb466360 MK II 2019-10-26 18:59:34 -04:00
kevinz000
50b9ae3cf3 Update large_objects.dm 2019-10-25 09:39:00 -07:00
Trilbyspaceclone
8ce8246182 lowers paperwork 2019-10-21 19:01:59 -04:00
Trilbyspaceclone
113f62a705 right 
we removed my tools...
 2019-10-17 01:38:29 -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
f0a1d44503 Part 1 
The food brake
 2019-08-28 16:54:10 -04:00
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