kevinz000
763c835a53
bitflags not equals
2020-03-16 04:26:19 -07:00
kevinz000
2a9e4bebdd
priority
2020-03-16 04:24:18 -07:00
kevinz000
69374c64c9
k
2020-03-16 04:18:22 -07:00
kevinz000
857f793600
ok
2020-03-16 04:12:54 -07:00
kevinz000
644273beca
k
2020-03-16 04:09:25 -07:00
kevinz000
94db06509c
slight desword reflect meme buff
2020-03-16 03:50:26 -07:00
kevinz000
d32bff7815
return list
2020-03-16 03:35:10 -07:00
kevinz000
09e1be9651
block args
2020-03-16 03:32:12 -07:00
kevinz000
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
kevinz000
5d2fb654e8
k
2020-03-16 03:23:09 -07:00
kevinz000
9ead492bb0
changes
2020-03-16 00:28:18 -07:00
kevinz000
4d0677daa9
s
2020-03-14 21:48:23 -07:00
kevinz000
2113b63428
o boy
2020-03-14 21:42:23 -07:00
kevinz000
1a061a5d3e
agony
2020-03-14 21:14:56 -07:00
kevinz000
d4131912e9
Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1
...
make the CMO hypokit not literally worse than normal ones
2020-03-14 09:11:58 -07:00
kevinz000
395fa32136
Merge pull request #11447 from Ghommie/Ghommie-cit618
...
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
Putnam3145
d9dc91db1a
More dynamic fixes ( #11451 )
...
* Fixed wizard, malf AI
* changed memes typename to story
* Fixed a bunch of really weird execute/ready confusion
* Added dynamic requirement to wands.
2020-03-14 02:49:25 +01:00
Lin
0ca58b5ed8
why though
2020-03-13 04:19:20 +00:00
Ghommie
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
kevinz000
87928d43ea
stamcrit check for fireaxe afterattack() ( #11426 )
...
* Update twohanded.dm
* Update twohanded.dm
2020-03-12 14:21:47 +01:00
Ghom
9e3a3dddfd
Merge pull request #11429 from Putnam3145/dynamic-tweaks
...
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
Ghom
c771471895
Merge pull request #11406 from kevinz000/minimaps
...
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2020-03-12 14:18:39 +01:00
kevinz000
0b6c5b7960
Update twohanded.dm
2020-03-11 18:19:09 -07:00
kevinz000
14b22f0b67
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
kevinz000
54713dc1e4
Merge pull request #11408 from necromanceranne/sleeping_carp_port
...
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
2020-03-11 17:26:33 -07: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
0d80c8c169
Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
...
RCL inhands wires fix.
2020-03-11 17:01:01 -07:00
Ghom
199272ca9d
Merge pull request #11410 from necromanceranne/harvesters_and_mechs
...
Ports tg#44633: Fixes blood beam oneshotting mech pilots.
2020-03-12 00:28:03 +01:00
Putnam
1e907ac1c0
Made random's pop_antag_ratio 7 too
2020-03-11 02:58:39 -07:00
Putnam
5b46af0f88
Added a proper extended-lite.
2020-03-11 02:47:59 -07:00
Putnam
8db3a3ced4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dynamic-tweaks
2020-03-11 02:17:16 -07:00
Putnam
a724de6dd8
Moved disease, revenant from midround to event.
2020-03-11 01:40:13 -07:00
Putnam
f5bde6a869
Let clown ops inherit from nuke ops
2020-03-11 01:39:48 -07:00
Putnam
f229e8c8fb
Enabled clown ops
2020-03-11 01:19:54 -07:00
Putnam
230138d31d
Rejiggered the weights (config needs updated anyway)
2020-03-11 01:19:47 -07:00
Putnam
bf511d0208
Made storytellers have different possible antag-per-pop goals
2020-03-10 23:39:14 -07:00
Putnam
995fc09c87
Made threatening meteors more likely
2020-03-10 23:38:47 -07:00
Putnam
621ea62d64
Added swarmers, portal storm, wormholes to dynamic.
2020-03-10 23:21:47 -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
Ghom
0d7612dcf5
[s] Sanitizes ParseSong tempo.
2020-03-11 00:29:31 +01:00
Ghommie
27a7f754c4
Fix runtimes some more.
2020-03-10 22:40:06 +01:00
Ghom
b03af0ea9a
Update RCL.dm
2020-03-10 14:44:33 +01:00
necromanceranne
8caea8e83a
Ports tg#44633
2020-03-10 23:59:50 +11:00
kevinz000
832d894e92
Merge pull request #11388 from Owai-Seek/crabby-patty-3/1/20
...
Food Ports / Butter Bear / Food Craft Speed
2020-03-10 05:59:24 -07:00
kevinz000
e210f7d535
Merge pull request #11391 from Ghommie/Ghommie-cit612
...
Porting "Further update_icon splitup"
2020-03-10 05:58:17 -07:00
kevinz000
3eac86cf31
Merge pull request #11394 from Citadel-Station-13/Ghommie-patch-3
...
Actually fixing that one overlay.
2020-03-10 05:57:18 -07:00
kevinz000
bfb75eb26b
Merge pull request #11396 from Ghommie/Ghommie-cit613
...
Ports "Switches out the three billion args of electrocute act for flags"
2020-03-10 05:56:28 -07:00
necromanceranne
b03d83926a
Forgot the scroll
2020-03-10 20:27:40 +11:00
Ghommie
4143c1963c
Porting more legcuffs / bola fixes etcetera
2020-03-09 16:20:51 +01:00