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
|
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 |
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
Ghommie
|
32ee2f6197
|
minor pet peeve with the anomalous honking crystal & co.
|
2020-01-24 21:51:24 +01:00 |
|
Putnam
|
c58b4daa35
|
collectors too
this doesn't compile but like. it's a draft
|
2020-01-24 11:58:58 -08:00 |
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
Ghommie
|
8e5f221bb9
|
Ports "Makes falsewall hide pipes and wires"
|
2020-01-24 00:57:27 +01:00 |
|
Ghommie
|
292aaa58dc
|
Fixes dead malf AI doomsday, a few ported updates.
|
2020-01-23 17:36:23 +01:00 |
|