Commit Graph

332 Commits

Author SHA1 Message Date
Dahlular
cf02e7fe14 Merge pull request #153 from zeskorion/master
[PORT]here you go, bee viro
2020-01-28 12:41:59 -07:00
zeskorion
8dcc4d11cf Fix a compile issue 2020-01-28 11:17:33 -08:00
Dahlular
23cd1bc795 Merge pull request #168 from Azarak/spraylights
Updates spraycans and crayons to be up to date with Citadel (colored lights and more designs to draw)
2020-01-28 11:53:48 -07:00
Dahlular
b79510f689 Merge branch 'master' into patch-3 2020-01-28 11:21:48 -07:00
Dahlular
51d638bd0d Merge pull request #167 from DeusHarbinger/patch-4
watcher wing
2020-01-28 11:19:28 -07:00
Dahlular
b794a6f1ad Merge pull request #166 from Seris02/wintercoattide2
more winter coats yep
2020-01-28 11:18:43 -07:00
Dahlular
c2d457f8cb Merge pull request #158 from cyfause/master
LET THE PLASMOIDS CHOOSE THEY WANGS
2020-01-28 11:14:37 -07:00
Dahlular
08be6a0812 Merge pull request #154 from Burns-The-Potatos/master
changes dong girth to more reasonable size
2020-01-28 11:13:43 -07:00
Azarak
a6dfd6b6b6 update 2020-01-28 16:58:09 +01:00
DeusHarbinger
045878142d watcher wing
effect lasts for 5 seconds instead of 1
2020-01-28 09:47:50 -05:00
Seris02
a00f43490f yepo 2020-01-28 21:56:04 +08:00
Azarak
8c4ad4c728 spray paint update 2020-01-28 04:19:54 +01:00
Dahlular
7b8464edb4 Merge pull request #155 from jbox144/patch-1
Breast size preferences increased from E cups to H cups
2020-01-26 06:55:56 -07:00
jbox1
c0cb085018 Update _cit_helpers.dm 2020-01-26 17:38:13 +11:00
jbox1
93f13f2bc3 Update global_lists.dm 2020-01-26 17:37:38 +11:00
jbox1
fc67964877 Enabling breast fluid type customisation 2020-01-26 17:36:17 +11:00
Ecron
05f6215773 LET THE PLASMOIDS CHOOSE THEY WANGS 2020-01-25 06:49:15 -05:00
jjpark-kb
84751165da Fix the Icon!
This fixes a bug with the crusher, when using it and losing the icon. :)
2020-01-19 20:05:11 -05:00
jbox1
b828a4d185 Breast size preferences increased from E cups to H cups
Changed the GLOB.breast_size_list to includes "f", "g" and "h", allowing users to set their breast size preferences up to H, the maximum size before wardrobe malfunctions.
2020-01-19 17:15:40 +11:00
Burns-The-Potatos
3d6132e630 Update citadel_defines.dm 2020-01-15 15:14:11 -07:00
zeskorion
a5a26da21c Update heartattack.dm 2020-01-11 15:05:55 -08:00
zeskorion
258db24b00 Add files via upload 2020-01-09 22:27:47 -08:00
zeskorion
29062af741 Update glass.dm 2020-01-09 22:16:47 -08:00
zeskorion
dda5a9b426 Update others.dm 2020-01-09 22:15:58 -08:00
zeskorion
a6d82f778c Update other_reagents.dm 2020-01-09 22:11:07 -08:00
zeskorion
67bcbcdfb1 Update symptoms.dm 2020-01-09 22:08:29 -08:00
zeskorion
7116e92b6c Update heal.dm 2020-01-09 22:07:19 -08:00
zeskorion
b657074c96 Update choking.dm 2020-01-09 22:06:54 -08:00
zeskorion
aed8b9b4bf Update presets.dm 2020-01-09 22:06:13 -08:00
zeskorion
743cd2aafc Update smartfridge.dm 2020-01-09 22:05:00 -08:00
zeskorion
36ceb0b7f9 Update braindamage.dm 2020-01-09 21:59:57 -08:00
zeskorion
f7cf9c86bd Update death.dm 2020-01-09 21:57:37 -08:00
zeskorion
5086b5dd94 Update unsorted.dm 2020-01-09 21:49:28 -08:00
zeskorion
e4cd4072cb Update braindamage.dm 2020-01-09 21:47:02 -08:00
zeskorion
30b6206351 Update death.dm 2020-01-09 21:41:36 -08:00
zeskorion
24b62dd010 Update traits.dm 2020-01-09 21:37:02 -08:00
zeskorion
197a4d870f Add files via upload 2020-01-09 21:25:08 -08:00
zeskorion
52afe3d2a8 Add files via upload 2020-01-09 21:05:38 -08:00
zeskorion
2104ba551b Update symptoms.dm 2020-01-09 21:02:34 -08:00
zeskorion
9573acc2ca Add files via upload 2020-01-09 21:01:10 -08:00
zeskorion
5aafcf9569 Update death.dm 2020-01-09 20:59:51 -08:00
quotefox
411d23c1ef security fix 2020-01-04 00:50:52 +00:00
quotefox
375bfcb76e Revert "Merge pull request #138 from Code-Cygnet/master"
This reverts commit 30ed0ecef2, reversing
changes made to 11b772557b.
2020-01-03 23:55:28 +00:00
quotefox
d108de122c Merge pull request #139 from SynnGraffkin/Bye-Bye-Greenshift-and-shitvote
[Merge Conflict] Removes Fake Greenshift and Obfuscated voting
2020-01-03 23:13:31 +00:00
quotefox
4da5d63e7f Merge pull request #127 from shellspeed1/Fixes-heat-icons-swapped
Fixes heat icons swapped
2020-01-03 23:05:28 +00:00
quotefox
a7fde7f494 Merge pull request #101 from Kraseo/grug-smash-rock
Crusher QOL changes
2020-01-03 23:04:56 +00:00
quotefox
30ed0ecef2 Merge pull request #138 from Code-Cygnet/master
Captain cocktail
2020-01-03 23:03:09 +00:00
quotefox
11b772557b Merge pull request #142 from SynnGraffkin/Robit-voices
Fixes Robodrobe Contraband Items
2019-12-22 07:21:20 +00:00
quotefox
370bafd225 Merge pull request #144 from shellspeed1/new-moth-fluff
Massively buffs insects (ports new moth wings and markings from tg)
2019-12-22 07:20:54 +00:00
quotefox
02b53ba388 Merge pull request #145 from shellspeed1/clothing-port
Ports Christmas clothing, and ports some loadout item additions.
2019-12-22 07:19:31 +00:00