shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,573 Commits 5 Branches 0 Tags
eb4ccb71208202fc63d241becfe477091ec1b310
Commit Graph

142 Commits

Author SHA1 Message Date
deathride58
c6874eccff Merge pull request #7569 from Tupinambis/HoSTelebaton 
The HoS starts with a telebaton instead of a stunbaton.
 2018-09-26 22:23:46 -04:00
Tupinambis
6c57649625 Replaces the head of securities stun baton with telebaton. 2018-09-12 16:48:38 -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
1bc8b3530c Adds spawn text when spawning in as a miner. (#7555) 
* adds spawn text when spawning in as a miner

* fixes compiling error
 2018-09-07 07:22:44 -07:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
b1688405d9 and finally, the modules folder. Now I can publish and take a break 2018-07-02 01:19:37 -04:00
CitrusGender
d50ae43d7f Fixed cyborgs not getting their names at round start 2018-06-24 13:55:03 -05:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
Jordan Brown
7be9b6ebf9 Antag reputation rewards are now configurable 2018-06-03 09:03:51 -05:00
ShizCalev
4ae974644c Standardizes and cleans up some admin messages & logging 2018-05-31 22:41:31 -05: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
CitadelStationBot
7bb6bc8dd3 [MIRROR] HoP/QM have access to vault (#6818) 
* Vault Access for QM (#37880)

* HoP/QM have access to vault

* Update captain.dm
 2018-05-27 17:25:18 -07:00
vuonojenmustaturska
f2fdbab0cb Adjust antag rep values 2018-05-25 14:14:24 -05:00
LetterJay
ea9b3622fd Merge branch 'master' into upstream-merge-37476 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2018-05-20 23:11:16 -05:00
deathride58
37b9d589ad Merge pull request #6679 from Citadel-Station-13/upstream-merge-37396 
[MIRROR] Track admin observer time
 2018-05-11 03:45:11 +00:00
Ordonis
ab81220eda Adds a French beret! HONH HONH HONH! (#37457) 
This is very similar to the Italian Moustache, but it's a beret. This will be part of a series of language items. Happy to entertain suggestions as to whether it should be a roundstart item or randomly scattered about maint/cargo crate restricted. In the spirit of atomizing PRs, this one will just be for the French Beret.

Ready for merge.
 2018-05-09 16:03:28 -05:00
Jordan Brown
baee4dead5 Merge pull request #37396 from KorPhaeron/mrcitruswantsyoutoclockin 
Track admin observer time
 2018-05-08 13:38:13 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
LetterJay
fbaa2d5ae8 Merge pull request #6370 from Citadel-Station-13/upstream-merge-37132 
[MIRROR] Fixes brain dna
 2018-04-14 07:44:36 -05:00
AnturK
2aff700c14 Fixes brain dna 2018-04-11 14:58:42 -05:00
pigeons
7a07c101df AI requires silicon exp instead of crew exp for roundstart role (#36469) 
* Ai requires silicon xp

* Reverses byond age change
 2018-04-11 04:54:32 -05:00
deathride58
e0d7630c19 Merge branch 'master' into synctesting 2018-04-09 21:43:26 +00:00
KorPhaeron
46b7b95897 Finishes overflow roles (#37053) 2018-04-09 05:10:14 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
kevinz000
38ae8beefc [READY]AI latejoins 2018-04-06 00:44:31 -05:00
vuonojenmustaturska
77e51603d4 move enforce_human_authority check before species.before_equip_job() 2018-04-04 09:03:37 -05:00
LetterJay
f7be23e78a Merge branch 'master' into upstream-merge-36442 2018-04-01 19:50:37 -05:00
Jordan Brown
4d0df4ab16 Merge pull request #36865 from factoryman942/master 
adds a "the" to robo's supervisor in job description
 2018-04-01 11:16:57 -05:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
Poojawa
8cbdf9fcb4 Merge branch 'master' into digileg-runtime 2018-03-19 21:33:50 -05:00
CitadelStationBot
980d69dde3 [MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000) 
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
 2018-03-19 21:25:01 -05:00
CitadelStationBot
6aaef3b010 [MIRROR] Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs] (#6013) 
* Adds mineral storage access to all jobs intended to be using a technology fabricator[read: 80% of the jobs]

* RND techwebs: Mineral access (#36387)
 2018-03-19 21:08:54 -05:00
Poojawa
d3407f1711 a few other little runtimes 2018-03-17 20:03:21 -05:00
ACCount
f0cf4ad29d [READY] NTNet airlocks 2018-03-08 22:42:46 -06:00
deathride58
b40310867e Update captain.dm 2018-03-02 21:39:10 -05:00
Sirenfal
44dc6ac3a0 Antagonist reputation system 2018-03-02 14:38:26 -06:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBot
1e65c813f0 [MIRROR] Extensive surgery additions (#5590) 
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
 2018-02-19 10:48:11 -06:00
Chayse Ramsay
377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
ThePainkiller
87708abd4c Fixed a typo on an eldritch god's pronunciation (#35611) 
Changed the text to get the Necronomicon. It's "Cthulhu" not "Cthulu", get it right!
 2018-02-15 10:39:55 -06:00
Chayse Ramsay
9c3c039dc1 Commenting out civilian job global init 2018-02-15 10:15:02 +00:00
deathride58
4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597) 
The chef's CQC skill now only works in the kitchen area
 2018-02-13 14:18:49 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Chayse Ramsay
a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
deathride58
17ed07d3b2 Merge pull request #5427 from Citadel-Station-13/upstream-merge-35417 
[MIRROR] The chef is also a cook
 2018-02-11 23:35:29 +00:00
deathride58
8aacd2c804 Update job_exp.dm 2018-02-11 16:44:29 -05:00