shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,985 Commits 5 Branches 0 Tags
8d9804e953847e43128e858bf217faaba4847ccd
Commit Graph

57 Commits

Author SHA1 Message Date
zerothebigboy
4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
zerothebigboy
1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00
BlueWildrose
5152a605d8 this is very warming 2021-04-01 11:36:30 -07:00
Blue Wildrose
fcd1080069 more booby and dick pill 2021-04-01 05:36:43 -07:00
Hatterhat
d473b271cb uh oh! it's another stupid fucking hatter pr! 2021-03-10 15:06:39 -06:00
Timothy Teakettle
75a2035774 Merge branch 'master' into wound-port 2020-07-21 01:10:51 +01:00
Chiirno
64d5bd0030 switches around messages 2020-07-19 21:38:44 -03:00
timothyteakettle
e8fade4f7f changes 2020-07-18 02:29:12 +01:00
Timothy Teakettle
a4478b0cda it continues 2020-07-17 22:38:28 +01:00
Chiirno
2940f0efa5 Update code/game/objects/items/storage/firstaid.dm 
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
 2020-07-10 02:35:42 -04:00
Cirno
2553ef6dd8 Am I finally free? 2020-07-05 00:46:56 -03:00
Cirno
03d79a1b65 I think this changed pills? 2020-06-29 18:52:21 -03:00
Ghommie
ae053a9a08 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800 2020-06-23 03:12:49 +02:00
silicons
99a7c49e52 Merge pull request #12561 from shellspeed1/Ports-kyro-chems 
Ports IV bags from TG
 2020-06-21 14:11:10 -07:00
shellspeed1
9197cb4813 allows storage in medbelts and organ boxes. 2020-06-18 21:06:22 -07:00
SmArtKar
170a38a3a7 Porting sutures and meshes from /TG/ (#12532) 
* Porting sutures and meshes from /TG/

* Recipes fix
 2020-06-16 16:22:56 -07:00
Ghom
8cb15f9279 Actually Balanced and Standardized Vendor Prices. (#12495) 2020-06-09 22:22:53 -07:00
Ghom
48b327ea74 chemistry/bio bags nerf and little pill volumetric tweak. (#12392) 
* chemistry bag nerf and little pill volumetric tweak.

* Yea, sure why not?

* hey.

* Kevinz review.
 2020-05-31 00:54:28 -07:00
Ghommie
e51ac4e745 Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event. 2020-05-29 17:58:35 +02:00
Ghom
ba3151bf1e Pills and pill bottles are now volumetric. (#12332) 2020-05-24 13:07:35 -07:00
kevinz000
5364666d0c Merge pull request #12212 from Trilbyspaceclone/patch-376 
Buffs and corrects organ storage box
 2020-05-12 12:34:45 -07:00
Trilbyspaceclone
db87da599c Update firstaid.dm 2020-05-11 08:41:03 -04:00
Trilbyspaceclone
3c87647fd2 Update firstaid.dm 2020-05-11 08:32:36 -04:00
Ghommie
b2a20d5438 reducing some prices as training wheel. 2020-05-03 05:37:04 +02:00
necromanceranne
94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
Lin
0ca58b5ed8 why though 2020-03-13 04:19:20 +00:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
nik707
63dd3487b3 Merge pull request #10090 from Hatterhat/the-one-where-a-4-tc-nukies-kit-gets-buffed 
the one where the combat medic kit gets buffed
 2019-12-19 14:11:27 -06:00
Hatterhat
a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
Hatterhat
6ff7083bfb the one where i buff a 4 tc item, give trilby a (You), and squash my commits 2019-12-08 01:29:08 -06:00
Ghommie
f5b4d6a0ad Oh bummers. 2019-11-29 07:27:05 +01:00
Ghommie
9b8ed8ca4f The fact we hit 10k on issues/PRs is not a good reason to make crappy PRs. 2019-11-29 07:14:51 +01:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Thalpy
41eee65b15 Merge branch 'master' into master 2019-06-17 12:18:40 +01:00
Trilbyspaceclone
60e89a6ca4 wrong w_class 2019-06-08 16:19:16 -04:00
Trilbyspaceclone
a86d6fd9cc Update firstaid.dm 2019-06-08 16:06:36 -04:00
Fermi
ddad7a173d All compiling errors fixed!! I did it!! 2019-05-11 15:47:58 +01:00
Fermi
f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
Thalpy
926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
Fermi
29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
Fermi
cb0e50be0a Missed / in last pr 2019-05-10 03:12:28 +01:00
Fermi
ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
Trilbyspaceclone
9ab2bf3860 + <-- BAD 2019-04-04 16:28:18 -04:00
Trilbyspaceclone
003dd6d93d + is bad I guess 2019-04-04 15:53:36 -04:00
Trilbyspaceclone
f92ba3714d Grammar fix 2019-04-04 13:58:21 -04:00
Trilbyspaceclone
76c952cd6f Update firstaid.dm 2019-04-04 13:57:15 -04: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
Tlaltecuhtli
01eb1bc7fe [READY] better contraband crates (#38321) 
feature: NT reports that the local contraband market has expanded, experts say that the Syndicate is involved.
 2018-06-21 18:52:15 -05:00