shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,194 Commits 5 Branches 0 Tags
614a462176f83de33db456cbce4251d45ea89627
Commit Graph

66 Commits

Author SHA1 Message Date
Fermi
614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" 
This reverts commit 1509d9d183.
 2019-11-24 03:33:02 +00:00
Fermi
ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
Fermi
1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'" 
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
 2019-11-24 03:04:13 +00:00
Fermi
c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi
8ea6618f5d Revert "ARGH" 
This reverts commit f0f52ce3f8.
 2019-11-24 03:01:59 +00:00
Fermi
f0f52ce3f8 ARGH 2019-11-24 02:55:50 +00:00
Fermi
0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
Trilbyspaceclone
96a8302dac Fine you can boh bomb again 2019-11-08 21:11:44 -05:00
Trilbyspaceclone
5e1ab01733 What do you mean I cant hold the armory on my back? 
But mmmmmuuuummmm I want to have 12 duffle bags in my bag of holding!!!
 2019-11-08 21:05:30 -05:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
lolman360
c694cb8652 h 2019-10-09 13:35:23 +11:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
TrilbySpaceClone
084b37ae4e tada 2019-09-04 10:13:32 -04:00
kevinz000
ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212 
gives drones a RPD
 2019-08-21 08:15:08 -07:00
Trilbyspaceclone
d1404a84d8 Update backpack.dm 2019-08-19 07:03:54 -04:00
kevinz000
3f734d9aca Merge pull request #8763 from Trilbyspaceclone/patch-188 
Reblances bone satchles
 2019-08-18 23:39:39 -07:00
Trilbyspaceclone
906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00
lolman360
2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
Ghommie
8c1e6ff66a Thanks for pointing that out, lolman. 2019-07-01 09:24:35 +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
Trilbyspaceclone
7830b27b07 Update backpack.dm 2019-06-26 19:27:22 -04:00
Ghom
41bd3caf3c Ports "Reorganizes the uplink, adds grenades and explosives category." (#8669) 
* Ports "Reorganizes the uplink, adds grenades and explosives category."

* Unbent codex, singing the sorrow of aborted spoils.

* .
 2019-06-23 06:00:27 -07:00
kevinz000
a37bf5bfaf Merge pull request #8541 from Trilbyspaceclone/patch-164 
Adds implanter and implanter cases to syndie surgery bags
 2019-06-08 01:21:28 -07:00
Trilbyspaceclone
03132569a7 Update backpack.dm 2019-06-05 15:54:51 -04:00
Trilbyspaceclone
5d80fb6811 Update backpack.dm 2019-05-30 15:04:45 -04:00
Sishen
c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
Trilbyspaceclone
ddf833d16c [Ready] Makes Adv surgery tools more common around the station! (#7938) 
* Fixing updater

* Adds the belt with tools!

* Adds belt to CMO locker

* Synda bag

* Adds the medical bag to uplink

* adds in cargo crate

* Apply suggestions from code review

Rag spelling check a base line item I guess

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

* Apply suggestions from code review

Spell check Rag at it again fixing Trilbys failers

Co-Authored-By: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
 2019-02-08 05:26:42 -08:00
nik707
2aa0eb2d1b different nerf 2018-09-04 16:31:35 -05:00
nik707
4b6398cfa9 nerfs smuggler satchels 2018-09-03 22:58:08 -05:00
deathride58
f1739cb482 Upstream fix mirror spree (#7362) 
* tgstation/tgstation#39025 - Fixes nukeop eshield not being buyable

* tgstation/tgstation#39011 - [s] Adds missing logging to the staff of storms

* tgstation/tgstation#38980 - Corrects a stat error in the Nuke Ops uplink

* tgstation/tgstation#38988 - Fixes blob victory.

* tgstation/tgstation#38990 - Allow players to un-ignore previously ignored popups for ghostroles, and ignore notifications with no ignore button

needs tgui recompile

* tgstation/tgstation#38994 - Fix timer bug

* TGUI recompile

* tgstation/tgstation#39035 - Fixes navigation computers.

* tgstation/tgstation#39043 - Fixes minor genetics scanner runtime

* tgstation/tgstation#39044 - Fixes burgers icons

* tgstation/tgstation#39055 - Fixes porta_turret and decal shuttle rotations

* tgstation/tgstation#39063 - Stops extinguishers from cooling turfs to absolute zero

* tgstation/tgstation#38967 - Fixes smuggler's satchel init typo

* tgstation/tgstation#38931 - Fixes pulse rifles exploding structures in nullspace and that sort of thing
 2018-07-20 03:40:39 -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
06b7cdf27a Merge branch 'master' into upstream-merge-37529 2018-05-22 08:02:46 -05:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
LetterJay
e57cf81636 Merge branch 'master' into upstream-merge-37582 2018-05-21 08:35:21 -05:00
LetterJay
0758204515 Merge branch 'master' into upstream-merge-37476 2018-05-20 23:12:07 -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
81Denton
8235db8b5c this violates the space geneva convention (#37903) 2018-05-18 16:46:05 -05:00
Tlaltecuhtli
325b31f11e fixes some inconsistency in the bulldog shotgun ammo (#37548) 
the default bulldog shotgun ammo makes sense now
 2018-05-09 16:24:17 -05: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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
f373b2c9e6 Kills off three more flags from flags_2 2018-04-29 17:30:55 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
Poojawa
cc6b320f83 game folder 2018-04-23 00:17:28 -05:00