Commit Graph

137 Commits

Author SHA1 Message Date
kevinz000
1336404eb6 last ones 2020-06-17 21:37:19 -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
deathride58
d4621bb704 corrects the date for lesbian visibility! 2020-06-09 20:55:22 -04:00
deathride58
d0ff964c28 Adds more LGBTQIA+-related holidays! 2020-06-09 20:19:52 -04:00
deathride58
3eb3934e26 Adds Pride Month as a holiday! (#12436)
* Adds pride month as a holiday, complete with assistants spawning with rainbow jumpsuits

* yknow what, while i'm at it, let's compress it
2020-06-04 15:40:31 -07:00
KathrinBailey
ff51c9d2db Improvised Weapons Update: Part 1 (#12226)
* Improvised Weapons Part 1: Shotgun & Rifle

Adds new sprites for ammo, the improvised rifle, the improvised shotgun. Adds a hand saw. Adds things to the crafting menu. Adds things to the autolathe menu.

* PR not yet ready - just cleaning issues.

Just trying to remark some of the issues resolved so I can see where I'm at a bit easier.

* Reverting changes to shotgun ammo names in the autolathe.

No point calling it 12G when there's no 20G anymore.

* Weapon weight + sprite improvements.

Makes sprites for gun parts bulkier with a low alpha pixel outline to make them easier to click on. They also look a bit closer to what their final product will be.

* oops forgot the "

* Revert "Merge branch 'master' into Improvised-Part-1"

This reverts commit 1e43d228d1bc35b0582244ed0bd91934573b3cdd, reversing
changes made to 207e9fccd4e8cffbe9ed26401a6f516fc44245dd.

* Revert "Revert "Merge branch 'master' into Improvised-Part-1""

This reverts commit 22d421d010c4a4c5c5e26f49fe6bffcf6198df42.

* My Github or environment isn't flipping out. no more.

Derp. Also projectile damage modifier fixed. I can actually compile without hundreds of errors.

* Made small weapon parts have w_class small.

I was testing it out and seeing the trigger assembly take so much space in my inventory seemed really odd.

* Duplicate definition refused.

Hurrdurr I suck.
Glad I gave this a quick look-voer.
Shotgun description edited to reflect the 0.8x damage modifier.

* Resolved tools.dmi merge conflict.

Just took the dmi from master and put the new sprites on at the end.

* DNM - Trying to see why usptream tools.dmi with my stuff added on the end is conflicting.

* Please don't conflict
2020-05-28 23:24:42 -07:00
Ghom
9eccef2836 Porting "Personal interaction messages to simple animals" and more. (#12268)
* Porting "Personal interaction messages to simple animals" and more.

* Travis check.

* doc

* whoopsie.

* )
2020-05-18 04:46:57 -07:00
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Putnam3145
3d8084709b A dynamic rework: target threat levels (#11515)
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-25 17:40:37 +01:00
kevinz000
56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
Winter Flare
c97111beda Reorganise Food + Balance Tweaks
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
Ghommie
37441437d1 a 2019-12-28 23:02:28 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
ee73806616 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit352 2019-11-21 09:18:14 +01:00
nik707
0300927974 Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
2019-11-20 23:00:09 -06:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000
4ad56ac1e2 Merge pull request #9614 from Trilbyspaceclone/patch-234
Lowers ghosts and insain clowns hp to 120 from 1e6
2019-11-14 16:07:43 -07:00
Ghommie
b48ddb99fc Uplink items are now automatically sorted alphabetically. Fixed categories. 2019-11-14 02:56:26 +01:00
Ghommie
09860d463f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-10 23:23:36 +01:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
Trilbyspaceclone
fe87eec45c i hate mob code 2019-11-04 00:58:51 -05:00
Ghommie
431ab8fc0b better be safe than sorry. 2019-11-03 17:56:30 +01:00
Ghommie
3cf056ed93 Also fixing jacqueen... wrong tools.dmi 2019-11-03 15:26:16 +01:00
Ghommie
2653a2965d How about we only check the living? 2019-11-02 20:46:33 +01:00
Ghommie
f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie
50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie
3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie
a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie
1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
Trilbyspaceclone
bbd3c55fbc Update halloween.dm 2019-10-29 21:37:44 -04:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Fermi
be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi
5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Thalpy
e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy
a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy
39f7116353 Oops 2019-10-29 03:22:21 +00:00
Thalpy
0fabd72087 Barth you fusspot 2019-10-27 22:40:45 +00:00
Thalpy
6de94a23c0 Oops 2019-10-27 22:32:47 +00:00