shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,417 Commits 5 Branches 0 Tags
eee1ccbe2ca72dbdbe295f95ee2fad9afbdef4ae
Commit Graph

2874 Commits

Author SHA1 Message Date
nik707
2fe5571887 Merge pull request #9212 from dapnee/plasmaglass-tables-spears 
Plasmaglass Tables, Spears, Shards (Take 2)
 2019-09-02 18:37:22 -05:00
nik707
67f4276aab Merge pull request #9104 from Sishen1542/tbaton 
classic & telebaton no longer have attack delay
 2019-09-02 18:35:56 -05:00
nik707
bff828d3be Merge pull request #9202 from Trilbyspaceclone/patch-216 
Ports "Fixes wallets #510" From KeplerStation
 2019-08-29 19:33:08 -05:00
nik707
fccafd6bd9 Merge pull request #9204 from Trilbyspaceclone/patch-217 
Fixes katana's being cursed when not cursed
 2019-08-29 19:31:40 -05:00
Dap
19678119c5 Merge branch 'plasmatables' into plasmaglass-tables-spears 2019-08-28 14:55:01 -06:00
nik707
8e40e9d887 Merge pull request #9186 from Sishen1542/walklikeanegyptian 
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
 2019-08-28 00:02:39 -05:00
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
Trilbyspaceclone
6cf4783486 fixed 2019-08-27 13:56:47 -04:00
Trilbyspaceclone
77863119f2 Update wallets.dm 2019-08-27 11:31:52 -04:00
kevinz000
78c1ad972f Merge pull request #9179 from chefferz/master 
Gives His Grace stamina regeneration
 2019-08-26 19:39:46 -07:00
Dap
f104ba1f90 Plasmaglass Spears and plasmaglass actually drops plasma shards! 2019-08-25 21:38:04 -06:00
kappa-sama
036115eddb wallets can hold keys 2019-08-25 15:45:47 -04:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
chefferz
3fcf9b329f Update his_grace.dm 2019-08-23 21:46:04 -04:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
Dap
a80dfada21 [WIP] Plasmaglass Tables! 
## About The Pull Request
Hey hey people, now you can have pink tables. The scientists on SS13 have really out done themselves today. So far it drops regular glass shards, but tg already has plasma glass shards that I'll try to port once I get around to it.

## Why It's Good For The Game
New thing for people to make, basically a stronger table, but it still breaks when a player stands on it.

## Changelog
🆑
add: Plasmaglass tables
/🆑
 2019-08-23 12:38:07 -06:00
chefferz
788d616c76 Update his_grace.dm 2019-08-23 03:47:21 -04:00
chefferz
de4d4a990b Updated weight class 
Updated weight class per Bhjin's suggestion
 2019-08-22 21:07:31 -04:00
chefferz
dca81de36c Gives His Grace stamina regeneration 
His Grace, the 20TC item, is meant to absorb stun damage. When it feeds on corpses, its hunger increases quickly and steadily, but the current stamina system makes it impossible to actually fight without stamcritting yourself and getting eaten.

This gives regeneration to where you can actually use His Grace in the later stages without suffering from exhaustion.
 2019-08-22 20:09:52 -04:00
kevinz000
ba2a6d6626 Merge pull request #9145 from Trilbyspaceclone/patch-212 
gives drones a RPD
 2019-08-21 08:15:08 -07:00
Sishen
7a8e2c3f50 rebalances the lawyer heirloom briefcase while giving it a fancy new sprite 2019-08-19 17:54:16 -04:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04: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
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
Trilbyspaceclone
906e7a1bd8 Update backpack.dm 2019-08-17 00:25:40 -04:00
lolman360
ae2ccb2686 should be done now 2019-08-17 12:20:37 +10:00
lolman360
7d12535ead thanks paxxy boi 2019-08-17 12:18:18 +10:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
Sishen
6fab91046d Update misc.dm 2019-08-15 13:04:28 -04:00
Winter Flare
04c302b08e Service Tweaks 
Makes the Janibelt a bit more useful by expanding its limited pool of allowed items. Beakers and Bottles for carrying additional space cleaner/ammonia/water.

Allows the plant DNA maniuplator to be wrenched and moved.
 2019-08-15 06:28:46 -04:00
Sishen
ad91152c83 Update misc.dm 2019-08-14 17:08:33 -04:00
Sishen
f6baaf8c58 honk honk 2019-08-14 17:06:58 -04:00
Winter Flare
141a93236c Service QoL 
-Adds the Pimpin' Ride to the Custodial Locator Cartridge.
-Makes additional Pimpin' Rides orderable through cargo.
-Moves Light Replacer from power_designs to misc_designs and properly places it in equipment (where all other advanced sanitation research items appear.)
 2019-08-14 04:01:18 -04:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
kevinz000
123b478edd Merge pull request #8927 from Ghommie/Ghommie-cit151 
Tones down some items attack stamina costs. kills hypereutactic blades copypasta.
 2019-08-11 10:12:20 -07:00
Sishen
3e2f35b96c nyoom 2019-08-11 04:04:01 -04:00
lolman360
b283a0979c yay 2019-08-11 14:56:42 +10:00
lolman360
e2e7133eba ew things are called different things 2019-08-11 14:54:17 +10:00
BlackMajor
5dcd419d8a Merge pull request #8356 from Thalpy/master 
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
 2019-08-11 16:09:23 +12:00
lolman360
22b461c78f Merge pull request #1 from lolman360/master 
d
 2019-08-11 12:00:55 +10:00
lolman360
e4a9f2743b and gitbabby 2019-08-11 11:14:07 +10:00
lolman360
aa71a39fa8 so basically im monky 2019-08-11 11:13:38 +10:00
lolman360
2c1add5276 all my other comimits were to master 2019-08-11 11:13:02 +10:00
lolman360
f131104a73 Add files via upload 2019-08-11 10:51:38 +10:00
kevinz000
74008beb8f Merge pull request #9066 from Ghommie/Ghommie-cit181 
Two lines fixes for invisible zipties and borked legcuffs.
 2019-08-09 22:17:31 -07:00
kevinz000
14033d9876 Merge pull request #9085 from Ghommie/Ghommie-cit186 
underwear colors fix 2: The revenge of the crunch.
 2019-08-09 22:15:55 -07:00
Fermi
02b5100be7 Made scans advanced. 2019-08-09 13:01:14 +01:00
Fermi
6e0303fdba Actual fix for #9091 2019-08-09 12:48:26 +01:00