shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22,068 Commits 5 Branches 0 Tags
589cdae0e149e763afd94df9feed948c69f9df48
Commit Graph

677 Commits

Author SHA1 Message Date
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
Ghommie
a3a2fb03b6 My bad, my bad. 2019-07-14 14:21:28 +02:00
kevinz000
b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123 
Porting in two bar signs.
 2019-07-12 07:36:29 -07:00
kevinz000
650842b384 Merge pull request #8854 from Ghommie/Ghommie-cit126 
Stamina damage melee weaponry fixes.
 2019-07-12 07:36:01 -07:00
Ghommie
143410c176 Blame Poojawa for the issue. 2019-07-11 07:39:29 +02:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Ghommie
9cf2dea999 Grille spam. 2019-07-09 08:35:32 +02:00
Ghommie
3ce1497ef2 Ports in two bar signs. 2019-07-08 17:02:08 +02:00
Ghommie
9f0278c34f map merging. 2019-06-24 06:13:42 +02:00
Ghommie
fd68236594 ports "More variety for dorms bedsheets" + 3 new bed sheets. 2019-06-24 05:54:14 +02:00
Ghommie
55795355fd Ports "[s] Fixes pride mirror exploit" 2019-06-19 03:31:36 +02:00
kevinz000
1408a453de Merge pull request #8591 from Ghommie/Ghommie-cit43 
You smell that? Napalm, son.
 2019-06-16 01:16:12 -07:00
unknown
80eb813a07 RD can now suplex a rod. Good fucking luck. 2019-06-11 18:53:17 +03:00
Ghommie
c3fa360270 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit43 2019-06-09 04:50:10 +02:00
Ghommie
7706ec6329 I LOVE THE SMELL OF NAPALM IN THE MORNING! 2019-06-09 02:45:14 +02:00
kevinz000
2f2885f1d6 Merge pull request #8558 from Ghommie/Ghommie-cit35 
Ports in the container_type to reagents flags refactor.
 2019-06-08 01:26:28 -07:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
7aac9e6280 Updates reagents a bit. 2019-06-07 06:27:04 +02:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
deathride58
4fc31f6322 Merge branch 'master' into fuckatmos 2019-05-25 15:34:06 -04:00
dtfe3
0e0dff14b9 Increased music maxlines from 300 to 600 
Allows players to play longer and more advanced songs on the instruments.
 2019-05-09 14:10:43 +02:00
deathride58
2c9deab42e removes add_gas() and assert_gas(). next up: do further testing with garbage_collect() present and not present 2019-04-14 10:33:39 -04:00
deathride58
8b75240d89 fuck atmos - attempts to optimize atmos by removing GAS_META from the gas mixture meta list and removing the usage of gas archive 2019-04-11 17:07:11 -04:00
Cyprian
81fde9c7a6 Forgot to add the CE beret to the CE locker. 2019-04-06 23:34:10 +02:00
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
deathride58
df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD 
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
 2019-03-08 20:46:19 -05:00
Trilbyspaceclone
06174f77a5 Update lattice.dm 2019-03-04 16:31:40 -05:00
deathride58
c11aba9368 oh, right. i've gotta add a snowflake check since /living lacks bleed() in the base code 2019-02-20 03:37:07 -05:00
deathride58
20740bda39 a bloody fun time - atomizes the med rework's blood effect changes and makes the blood reagent act more like you'd expect 2019-02-20 00:38:23 -05:00
Trilbyspaceclone
7a2088aba6 Adds usefull tools/healing items to utility lockers - Requested by LeonDuvall (#7974) 
* Update utility_closets.dm

* Update firstaid.dm

* Update pill.dm

* Update hypospray.dm

* Update firstaid.dm

* Update pill.dm
 2019-02-13 20:46:55 -08: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
Jacie Thorpe
ffb13d4a03 Removed Picking Zombie from Magic Mirror (#7942) 2019-01-19 15:24:45 -08:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet 
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
 2018-12-10 16:45:38 -06:00
Redtail
4c7075f1a8 New medals added. 
add:  Two new medals for engineering and medical to give out.
 2018-12-08 12:12:36 -06:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate. 
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
 2018-12-07 22:48:46 -06:00
nik707
fd2e9ad5c0 Merge pull request #7753 from Trilbyspaceclone/Trilbyspaceclonepatch-6 
Makes skeletal no longer KPA proof, but Pirate skeletal are still do to being Free or something
 2018-11-23 15:12:19 -06:00
Trilbyspaceclone
f3f314ea6e Yarr 2018-11-20 20:05:31 -05:00
deathride58
402a5ba9e4 Makes it plausible to join as ghost roles from the latejoin menu (#7726) 
* Makes it plausible to join as ghost roles from the latejoin menu

* Clarifies a little bit of the text
 2018-11-16 14:47:42 -08:00
deathride58
1d198a6ea1 Merge pull request #7652 from Michiyamenotehifunana/ToriCrate 
Resprites all regular crates to 3/4ths ones
 2018-10-14 04:45:01 -04:00
Michiyamenotehifunana
f40011a0ce Resprites all basic crates 2018-10-13 17:43:21 +08:00
Poojawa
a29e30a543 fixes runtimes 2018-10-12 05:55:50 -05:00
deathride58
0ce450eab8 tgstation/tgstation#40662 - Stops using the rad insulation component to provide default rad insulation features in order to save a bit of memory 2018-10-02 19:36:21 -04:00
Poojawa
d231018a3a Flashy flash and Gondola Pods 
and cult effect addition, fixes CTF
 2018-09-21 02:48:17 -05:00
Poojawa
c836a7e5ea Cleans up map errors 
Knowing my fucking luck it ain't all of 'em
 2018-09-20 04:28:02 -05:00
Poojawa
cb342866d6 a few last minute changes from TG 
also changes His Grace from 25 to 10 requirments
 2018-09-18 23:12:29 -05:00
Poojawa
7d300117af literally everything Bhjin has been complaining about 
also modularizes stuff and adds more comments. Like responsible downstream repos should have.
 2018-09-18 03:59:46 -05:00