Commit Graph

1746 Commits

Author SHA1 Message Date
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
2020-03-28 16:00:48 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Seris02
17f4b0f34f I assume this works 2020-03-26 17:46:41 +08:00
KathrinBailey
134d861fd7 KAT SHUTTERS ALL OF THE STUFF
Checked: Animations timings, the buttons in-game (they open and close), the radiation insulation (rad shutters don't block rads once open but do once closed, 0.2x multiplier to rads). Animations all play and the shutters actually open and close.
2020-03-24 20:13:48 +00:00
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549)
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
2020-03-22 13:02:23 +01:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376)
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

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

* Update code/modules/mob/living/living_combat.dm

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

* Update code/modules/mob/living/living_combat.dm

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

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-21 16:04:26 +01:00
kevinz000
d1da7c8131 Merge pull request #11529 from Trilbyspaceclone/patch-312
Small pipes
2020-03-20 22:57:43 -07:00
kevinz000
7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595
Yeets the preferences_vore datum and migrates its stuff to preferences.
2020-03-19 08:30:18 -07:00
Seris02
ea8941343e stops validhunting geneticists from knowing exactly who is an is a vampire (and allows vampires genes) (#11520)
* yeet gone

* pfft oof

* oof
2020-03-19 13:40:11 +01:00
Trilbyspaceclone
700a2031c8 Update construction.dm 2020-03-19 00:40:59 -04:00
kevinz000
0e944a2ac7 Merge pull request #11504 from necromanceranne/turret_fix
Fixes being unable to remove turret guns
2020-03-17 09:26:04 -07:00
kevinz000
1585b34e41 Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1
Fixing a couple issues with recyclers.
2020-03-16 13:23:46 -07:00
kevinz000
fd7bfaba06 Merge pull request #11480 from Ghommie/Ghommie-cit623
Banana pies, beams. runtime errors and warnings.
2020-03-16 13:22:49 -07:00
necromanceranne
fc2b6a9a81 fixes turrets 2020-03-17 03:57:35 +11:00
Seris02
259bb03969 fixes the swapping of buttons (#11475) 2020-03-16 01:57:55 +01:00
Ghom
2b9f352a14 Fixing a couple issues with recyclers. 2020-03-15 22:12:55 +01:00
Ghommie
b453a25e14 Something about banana pies, runtime errors and warnings. 2020-03-15 15:41:32 +01:00
Ghommie
8ccd0d2cbc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-03-12 20:31:14 +01:00
Ghommie
0876a1eef6 Porting datum components system updates. 2020-03-12 18:22:26 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
2020-03-11 17:01:37 -07:00
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
kevinz000
0791f22b62 Merge pull request #10702 from Ghommie/Ghommie-cit528
Hey, do you remember that wizard round where everyone tried arming up the nuclear bomb and we all went DELTA RED DELTA RED DELTA RED DELTA ?
2020-03-10 17:24:48 -07:00
Ghommie
27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Seris02
cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghom
8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI
Ports Skyrat's synths (Plus limb rendering overhaul and more)
2020-03-09 00:26:06 +01:00
kevinz000
0a68143a3e Merge pull request #11297 from Ghommie/Ghommie-cit597
some dozens lines about some update_overlays issues and cryopods/MMIs.
2020-03-06 00:20:54 -07:00
kevinz000
16d6ba9e21 Merge pull request #11323 from Ghommie/Ghommie-cit600
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
deathride58
2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
2020-03-05 20:03:56 -05:00
Ghommie
60c7268e37 Also fixing bloodsucker coffins. 2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f Porting a couple material datums code updates and fixes. 2020-03-04 15:59:46 +01:00
kevinz000
f67fa08f0f Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
kevinz000
8b0b685fa7 CHECK_MOBILITY 2020-03-03 20:40:33 -07:00
kevinz000
90188c51bf Merge pull request #11308 from Putnam3145/stop-lag
Removes lag
2020-03-03 20:28:47 -07:00
deathride58
9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Lin
fde24492b9 Merge pull request #11294 from Ghommie/Ghommie-cit596
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Putnam
3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag 2020-03-02 11:24:49 -08:00
Putnam
eefba5ce00 Removes lag 2020-03-02 11:24:46 -08:00
Ghommie
23cbb05578 Merge branch 'Ghommie-cit597' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit597 2020-03-02 16:33:56 +01:00
Ghommie
f915d14a58 Also cell chargers and cloning pods. 2020-03-02 16:28:31 +01:00
Ghom
4d4708a6ae Update cloning.dm 2020-03-02 01:28:20 +01:00
Ghommie
efaa99ae27 some dozens lines about PDA/update_overlays and cryopods/MMIs. 2020-03-01 23:17:35 +01:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Ghommie
c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d Actually.. 2020-03-01 16:02:58 +01:00
Ghommie
bcc1c954c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-02-29 15:16:43 +01:00
Ghommie
bd87d46ce6 Deletes the preferences_vore datum and migrates its contents to preferences. 2020-02-29 15:07:44 +01:00
ancientpower
5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
Ghom
c9a5f49623 Fixing a whoopsie with airlocks. 2020-02-28 17:28:02 +01:00