f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -07:00
24ba8b4d04
Update haste.dm
2020-02-21 18:17:54 -07:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
e85699df50
compile fix
2020-02-21 14:18:45 -07:00
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07:00
8395ee53e7
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
...
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
2020-02-21 02:47:18 +01:00
6347dab0a3
Merge pull request #11142 from kevinz000/vampire_haste
...
makes vampire haste more reliable and slightly less of an example of how not to code
2020-02-20 15:31:39 +01:00
2dd5a0cfb8
Merge branch 'master' into hijack
2020-02-19 22:25:31 -07:00
a06fcea985
Merge remote-tracking branch 'citadel/master' into vampire_haste
2020-02-19 19:16:58 -07:00
c7273c03be
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-19 19:12:27 -07:00
9589c3116b
Merge pull request #11115 from Ghommie/Ghommie-cit583
...
Something more about runtime errors.
2020-02-19 19:03:01 -07:00
c920d198e2
Update Viro to /tg/ standards
2020-02-19 12:17:57 -05:00
4a537d770d
let's make this work
2020-02-19 07:20:16 -07:00
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -07:00
698f0b8177
Something about pAIs and silicon access priviledges.
2020-02-18 16:20:44 +01:00
3785c94a1b
more responsive
2020-02-18 03:57:39 -07:00
ef05410b75
k
2020-02-18 03:32:04 -07:00
1e57463d1b
k
2020-02-18 03:16:47 -07:00
53d7192c9c
k
2020-02-18 03:12:57 -07:00
ffe1c794eb
Changes cult stunhand when halos are out ( #11053 )
...
* Changes cult stunhand when halos are out
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
* Changes the desc a little
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
* Requested changes
Requested changes
2020-02-17 13:29:51 +01:00
794aeb81c2
Merge pull request #11060 from kevinz000/stuff
...
guns and cult blood magic now respect stamina softcrit
2020-02-16 13:20:56 -06:00
23ae9996d2
Something more about runtime errors.
2020-02-16 15:24:15 +01:00
3b9f9d7a16
Requested changes
...
Requested changes
2020-02-15 18:15:41 -05:00
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
24b977f655
Merge branch 'master' into stuff
2020-02-15 11:45:25 -07:00
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
8b44b02f2d
Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
...
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
863ce5152b
Merge remote-tracking branch 'citadel/master' into stuff
2020-02-13 04:14:44 -07:00
bfdef7fcfd
Merge pull request #10755 from kevinz000/attack_chain
...
small refactor to melee_attack_chain
2020-02-13 09:39:07 +01:00
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
a8a071851a
s
2020-02-13 00:32:26 -07:00
5d32775170
Changes the desc a little
...
Changes it to "When the cult ascends, so does the spell, it burns and throws back the victim" Thanks Justin!
2020-02-12 21:31:48 -05:00
7949c4fa01
Changes cult stunhand when halos are out
...
Turns the stunhand into a burn + knockback hand. So it remains more defensive than offensive.
2020-02-12 21:24:12 -05:00
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
21ce2242ac
Conflict fix
2020-02-12 16:21:29 +02:00
8e50c278bb
Rebuild and misc nuke tweak
2020-02-10 17:34:14 +01:00
01390fa0e0
Merge remote-tracking branch 'citadel/master' into attack_chain
2020-02-10 04:18:02 -07:00
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
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
611c850639
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
41eebc6e2b
Fixes cloak
2020-02-07 13:42:56 +02:00
62b0e62952
Merge pull request #10623 from Putnam3145/antag-overhaul
...
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
73aa761c69
Merge pull request #10700 from Ghommie/Ghommie-cit526
...
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
50cabc3c64
Merge pull request #10889 from Ghommie/Ghommie-cit555
...
runtime drifting
2020-02-05 23:44:52 -07:00
402283e86a
Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
...
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07:00
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
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
0452286468
Fixes no thrall bloodcost
2020-02-04 11:21:47 +01:00
kevinz000