shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,260 Commits 5 Branches 0 Tags
a728f3f5772ca2bbfdb6ff37f511eb8317f2600e
Commit Graph

132 Commits

Author SHA1 Message Date
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Ghommie
3671755142 My cat resting on my neck is just sooo warm, like a best scarf. 2019-10-14 06:06:25 +02:00
Poojawa
bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
r4d6
fef7dd4ac5 Update flavor_misc.dm 2019-10-10 20:32:22 -04:00
Poojawa
fa7bf43ce7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-16 17:44:10 -05:00
Poojawa
bf3d30c0e4 Seperates Insect fluff from wings 
Fluff can be the new body markings I guess.
 2019-09-14 04:27:38 -05:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
94afbbd560 Adding Horn colors, multiple-select legs, and species squash 
Moths -> Insects. Avians & Aquatics into Mammal -> Anthromorphics. Modular Citadel sprite accessories decommissioned and sorted to my liking.  Sprites tweaked on a bunch of critters. Added new wings....
 2019-09-11 17:46:17 -05:00
nik707
bfd17d66cd Merge pull request #9074 from Citadel-Station-13/donator_grouping 
Donator grouping system
 2019-08-29 18:31:23 -05:00
Poojawa
bda3ac8745 blood dna is fixed, your ERP code is too 2019-08-20 07:41:50 -05:00
Poojawa
2d40733ff7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-17 05:43:05 -05:00
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00
Poojawa
0290a46ddc Impliments Ghom review, reverts blood list back to component 2019-08-15 12:32:44 -05:00
Raptorizer
d16ee247a0 Update maintenance_loot.dm 
Double the amount of peaches that spawn within Maintenance
 2019-08-15 07:24:09 -05:00
Raptorizer
a6d10885ec Revert "Update maintenance_loot.dm" 
This reverts commit 087bca85e8.
 2019-08-15 07:11:57 -05:00
Raptorizer
087bca85e8 Update maintenance_loot.dm 
Double the amount of canned peaches that spawn within maintenance
 2019-08-15 07:08:27 -05:00
kevinz000
277971971f s 2019-08-07 13:07:38 -07:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
Thalpy
f77bcc9765 Merge branch 'master' into master 2019-07-14 15:10:32 +01: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
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Ghommie
ba7c24a0ec Refactoring underwear to allow custom color preferences. 2019-07-09 23:25:54 +02:00
Thalpy
8a6e669060 Merge branch 'master' into master 2019-07-04 03:14:29 +01:00
kevinz000
bce4ce31ab Merge pull request #8778 from Ghommie/Ghommie-cit97 
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
 2019-07-03 13:47:04 -07:00
TrilbySpaceClone
9d6c930b2c owo 
Wat dis?
 2019-06-30 15:47:45 -04:00
Thalpy
696d879874 Merge branch 'master' into master 2019-06-29 15:48:25 +01:00
Ghommie
ad3b709c40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97 2019-06-29 06:39:21 +02:00
Ghommie
0371a5513a Porting in 18 new drinks from the TGstation, plus tweaking and fixes. 2019-06-29 06:03:57 +02:00
Ghommie
a2d896351b Sort of porting "Changes the type pathing of some "random" items" 2019-06-23 07:10:11 +02:00
Ghommie
b85d4d6fb3 Sort of porting MRE rations from Yogstation. 2019-06-22 16:05:03 +02:00
Fermi
6b9becce71 Merge branch 'pr/14' 2019-06-14 21:29:04 +01:00
SkullyRoberts
e83365daed Added a penis autosurgeon as rare maint loot 2019-06-08 17:12:51 -04:00
kevinz000
1488af1a52 Merge pull request #8554 from Ghommie/Ghommie-cit33 
Adds AI core screen selection to character preferences and turns icon selection menu into a radial.
 2019-06-08 01:24:59 -07:00
Ghommie
0b53df47de Enough clowning around. 2019-06-07 03:22:26 +02:00
SkullyRoberts
5482469a86 Added lightup shoes and heelys to maint loot 2019-05-30 13:02:18 -04: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
deathride58
4e00f59d82 Adds the ability to allow specific ckeys to bypass the panic bunker for a given round 2019-02-27 07:46:34 -05: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
Poojawa
bb13e70d32 globalvars 2018-09-11 00:58:01 -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
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
vuonojenmustaturska
1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
deathride58
50f8779fc0 Merge branch 'master' into upstream-merge-37486 2018-05-06 07:15:48 +00:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
vuonojenmustaturska
3f6167d08e Moves several clothing-specific flags from /atom to their proper type 2018-04-28 13:21:48 -05:00