shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,362 Commits 5 Branches 0 Tags
6581eb8526e9efe8ebea611cca43658bd650ca3c
Commit Graph

231 Commits

Author SHA1 Message Date
kevinz000
f7c5196954 nerf flight vision (#32312) 2017-11-02 04:08:51 -05:00
LetterJay
74a33169cb Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051 
[MIRROR] More radiation balance changes and fixes
 2017-10-29 02:41:44 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay
79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051) 
* more balance changes and fixes

* cleanup
 2017-10-27 03:08:03 -05:00
LetterJay
20bbd77f73 Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974 
[MIRROR] Biosuits now offer high Rad resistance
 2017-10-23 03:44:18 -04:00
Robustin
04b3a18502 Biosuits now offer high Rad resistance (#31974) 
* Biosuit rad resistance buff

* Buffed medical hardsuit rad resist
 2017-10-21 23:16:18 -05:00
Jordan Brown
d0789ecaf9 Splits clothing.dm in 7 other files 2017-10-21 19:01:30 -05:00
Poojawa
62273a3867 Merge branch 'master' into upstream-merge-31737 2017-10-21 07:18:14 -05:00
CitadelStationBot
d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -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
Emmett Gaines
28f3bc0918 Adds radiation goggles and a small rewrite to make adding more view modes in the future easier (#31751) 
* adds radiation goggles

* cleanup
 2017-10-19 02:54:23 -05:00
Jordan Brown
f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
Jordan Brown
742669cc62 Restores security bombsuit & white bombsuit 2017-10-15 11:33:42 -05:00
LetterJay
253f1e3f1c Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570 
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
 2017-10-14 15:37:17 -04:00
LetterJay
45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJay
c056349055 Update flightsuit.dm 2017-10-14 13:57:22 -05:00
LetterJay
49ffb814d5 Update flightsuit.dm 2017-10-14 09:23:01 -05:00
LetterJay
5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620 
[MIRROR] Fixes various Nanotrasen capitalizations
 2017-10-14 10:19:15 -04:00
LetterJay
d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
kevinz000
77d6420db0 Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes 2017-10-13 19:09:45 -05:00
francinum
f63adc1931 Fixes various Nanotrasen capitalizations (#31620) 
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
 2017-10-13 12:13:26 -05:00
Jordan Brown
bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines
55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
AnturK
5be4669924 Datum antag wizard. 2017-10-11 05:24:17 -05:00
LetterJay
a1d4868601 Merge pull request #3270 from Citadel-Station-13/upstream-merge-31437 
[MIRROR] Makes the santa event properly poll ghosts
 2017-10-10 05:54:44 -04:00
MoreRobustThanYou
b05a4ebb29 Makes the santa event properly poll ghosts (#31437) 
* Makes the santa event properly poll ghosts

* Update xmas.dm

* Update xmas.dm

* Create event.dm

* Update tgstation.dme

* Update xmas.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm

* Update event.dm
 2017-10-10 03:16:23 -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
LetterJay
3232f0a2a0 Update flightsuit.dm 2017-10-09 21:27:59 -05:00
XDTM
7a0ce217db Refactors virus spreading 2017-10-09 08:55:57 -05:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386 
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
 2017-10-08 16:18:18 -04:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
Jordan Brown
20172ca2bd Merge pull request #31372 from ShizCalev/cool-runnings 
Fixes cool threads grammar issue
 2017-10-07 08:42:36 -05:00
LetterJay
6546804c38 Merge pull request #3159 from Citadel-Station-13/upstream-merge-30525 
[MIRROR] Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby()
 2017-10-06 02:12:06 -04:00
LetterJay
52c57543cb Update misc_special.dm 2017-10-05 22:43:08 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
AnturK
f45344ed8c Adds wigs 2017-10-05 09:23:56 -05:00
oranges
574e166951 Merge pull request #31269 from Firecage/doublehardsuitrebalance 
Makes the ERT and Chronosuit hardsuits and helmets have the same armor stats.
 2017-10-05 03:02:11 -05:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
2cafd6fefb Merge pull request #3060 from Citadel-Station-13/upstream-merge-31086 
[MIRROR] Adds desc to things lacking them.
 2017-10-01 23:37:35 -04:00
LetterJay
fc89d769f0 Merge pull request #3056 from Citadel-Station-13/upstream-merge-31130 
[MIRROR] Adds the Cargo-Tech-of-the-Shift award
 2017-10-01 23:37:26 -04:00
oranges
d701230090 Merge pull request #31114 from AnturK/spacevision 
Fixes space vision
 2017-10-01 15:15:54 -05:00
bawhoppen
82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
Jordan Brown
3a83b28bae Adds the Cargo-Tech-of-the-Shift award 2017-10-01 09:43:20 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
kingofkosmos
f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
LetterJay
000ce51c9a Merge pull request #2927 from Citadel-Station-13/upstream-merge-30958 
[MIRROR] Makes a flags var use NONE instead of 0
 2017-09-27 16:31:38 -04:00
LetterJay
2e133c0b2c Update ears.dm 2017-09-27 15:12:22 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
vuonojenmustaturska
1aef27a0f0 Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967) 
* Jump boots fix

* requested changes

* Requested changes, also whoops
 2017-09-26 04:29:18 -05:00