Commit Graph

920 Commits

Author SHA1 Message Date
Artur
7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Ghom
8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
Ghom
bfdef7fcfd Merge pull request #10755 from kevinz000/attack_chain
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
Ghom
942f3f28be Merge pull request #10994 from DeltaFire15/narsierunefix
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
2020-02-12 16:51:38 +01:00
Artur
21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
Artur
8e50c278bb Rebuild and misc nuke tweak 2020-02-10 17:34:14 +01:00
kevinz000
01390fa0e0 Merge remote-tracking branch 'citadel/master' into attack_chain 2020-02-10 04:18:02 -07:00
DeltaFire
55a5686c01 No more Narsie runes in half the time or less
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
2020-02-10 02:46:54 +01:00
Putnam
611c850639 all you need to understand is everything you know is wrong 2020-02-08 00:31:46 -08:00
Artur
41eebc6e2b Fixes cloak 2020-02-07 13:42:56 +02:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
kevinz000
73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000
50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
Ghom
402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
kevinz000
ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2
Fixes Space Ninja "Nothing" Objective.
2020-02-04 03:33:55 -07:00
Artur
0452286468 Fixes no thrall bloodcost 2020-02-04 11:21:47 +01:00
Ghommie
a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00
Putnam
aabd0b9e79 fixing quirk removal (whoops) 2020-02-03 08:18:49 -08:00
Putnam
e4e5b651e6 making permassassin scale with dynamic 2020-02-03 08:11:03 -08:00
Putnam
53cad493a7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul 2020-02-03 03:17:23 -08:00
kevinz000
2393dc26eb Merge pull request #10779 from Ghommie/Ghommie-cit538
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1
Cleanup/Partial revert of RGB blood ""rework""
2020-02-02 19:08:57 +01:00
Artur
14d749bd76 Weh 2020-02-02 16:23:26 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Putnam
dd63e8cf84 oofies 2020-02-01 21:07:21 -08:00
Putnam
e812844c70 Revert "</span>"
This reverts commit d6d01d848c.
2020-02-01 21:05:27 -08:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghom
79387149a0 Fixes Space Ninja "Nothing" Objective. 2020-02-01 23:23:17 +01:00
Putnam
d6d01d848c </span> 2020-02-01 06:01:54 -08:00
Artur
11fea908bd Fix and rebalance a lil 2020-02-01 14:11:34 +01:00
Putnam
7e3ea27ff4 dumb formatting. dumb dumb. 2020-02-01 00:42:25 -08:00
Putnam
847e6382c0 fixes some quirk stuff 2020-02-01 00:32:08 -08:00
Putnam
3d9e84a3f8 Tweaks and fixes 2020-02-01 00:23:45 -08:00
Putnam
809f57a15d also added kill-once objectives 2020-01-31 12:25:19 -08:00
Putnam
29e0ac52c4 fuzzy objectives 2020-01-31 11:52:05 -08:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Arturlang
83ce84cdc4 Merge branch 'master' into TGUIs_Nexties 2020-01-30 20:46:20 +02:00
Artur
d3a9a481a6 Further tweaks 2020-01-30 18:13:05 +01:00
Artur
ee814f39ba Tweaks 2020-01-30 18:11:49 +01:00
Artur
1bf2a3e7ca Initial Commit 2020-01-30 17:28:02 +01:00
Ghommie
05567e2292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit538 2020-01-30 03:42:50 +01:00
Ghommie
0dba1b5102 added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP. 2020-01-30 02:17:02 +01:00
Ghom
7839724013 Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
2020-01-29 05:34:49 +01:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
kevinz000
e50eb495df pre attack refactor 2020-01-27 16:30:23 -07:00
kevinz000
26459a156d Merge pull request #10682 from Ghommie/Ghommie-cit519
Ports "Makes falsewall hide pipes and wires"
2020-01-25 05:53:07 -07:00
kevinz000
b9274c63d0 define usage 2020-01-24 22:50:28 -07:00
kevinz000
798af43cae reverts accidental/undocumented voodoo doll buff 2020-01-24 22:01:52 -07:00
kevinz000
afe8e00bdf Merge pull request #10677 from Ghommie/Ghommie-cit515
Fixes dead malf AIs being able to doomsday, plus a few ported updates.
2020-01-24 16:14:49 -07:00