shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

61 Commits

Author SHA1 Message Date
Artur
8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom
512d046f18 Merge pull request #10128 from Seris02/clownheadset 
gives the clown a headset with a clown megaphone loudmode
 2019-12-26 13:58:45 +01:00
Seris02
d73cb74f95 clown loudmode headset 2019-12-09 21:40:39 +08:00
Ghommie
f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Ghommie
298f2e02c6 Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron. 2019-11-08 22:33:26 +01:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Ghommie
f39a5d2f6a Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix. 2019-06-30 21:53:33 +02:00
Ghommie
5e4bbb0d02 Awaken, code. 2019-05-21 22:45:59 +02:00
kevinz000
b99556c70f Nanites port from /tg/station, original coder XDTM 2018-08-23 01:16:32 -07:00
deathride58
91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -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
LetterJay
e4eb4939b4 Merge pull request #6636 from Citadel-Station-13/upstream-merge-37582 
[MIRROR] Makes more messages pronoun sensitive
 2018-05-23 07:46:26 -05:00
LetterJay
990d997482 Update radio.dm 2018-05-23 05:41:41 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
6a575f19d1 Merge branch 'master' into upstream-merge-37597 2018-05-22 07:21:53 -05:00
deathride58
d4d052bae2 Update radio.dm 2018-05-06 03:10:20 -04:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
vuonojenmustaturska
0958d35b26 replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2 2018-05-02 13:14:43 -05: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
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
Tlaltecuhtli
2d9eb9202c improves radio code by fixing english 
wow
 2018-02-18 11:32:52 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
Tad Hardesty
4f33c20fba Fix radio jammers affecting other z-levels (#34705) 2018-01-21 21:18:00 -06:00
deathride58
d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
vuonojenmustaturska
fcceb5ec77 Finishes the forceMove port 2017-12-14 15:40:08 -06:00
oranges
cec6c028f5 [READY]Refactors uplinks to a component! 2017-11-22 15:17:03 -06:00
Jordan Brown
2498e1ddc0 Cleans up unused code 2017-11-20 10:14:32 -06:00
oranges
156aa30c61 Merge pull request #32729 from Qustinnus/cheapGBP 
removes an unused var from radio code
 2017-11-15 01:27:24 -06:00
kevinz000
0efaf92b6f fixes radios being perma-stuck on when emped (#32212) 
* fix radio emps

* woops forgot something!

* Update headset.dm
 2017-10-30 14:38:46 -05:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
vuonojenmustaturska
053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
CitadelStationBot
18904f2f0f Maintains that weird entire-tcomms-setup-in-one-machine thing 2017-08-26 11:08:01 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458) 
lets hope nothing blows up this time (Flags PR but it works!)
 2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996 Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457) 
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
 2017-08-22 04:04:21 -07:00
CitadelStationBot
87b3df3069 Replace all secondary flags with bitflags stored in the flags_2 var 2017-08-17 09:19:14 -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
CitadelStationBot
1b39381ee7 Ports radios to Initialize (#983) 2017-05-18 12:19:55 -05:00