f8a365490b
FUCK²
2020-03-14 13:15:09 +01:00
3f44882c1a
FUCK
2020-03-14 13:13:26 +01:00
a2592483b5
hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too
2020-03-14 13:07:13 +01:00
c8922547de
Automatic changelog generation for PR #11451 [ci skip]
2020-03-13 20:49:28 -05:00
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
245b7ed306
Automatic changelog generation for PR #11431 [ci skip]
2020-03-12 11:49:53 -05:00
bbd69c407c
Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1
...
Missing contractor tablet icon state fix
2020-03-12 09:49:50 -07:00
579799e72d
Automatic changelog generation for PR #11416 [ci skip]
2020-03-12 11:49:29 -05:00
78aa46d8de
Merge pull request #11416 from Trilbyspaceclone/patch-306
...
Makes Bluespace and Urianium reagents be able to be turned into sheets
2020-03-12 09:49:26 -07:00
b4f57a8885
Update others.dm
2020-03-12 10:56:25 -04:00
c6a9423c51
Automatic changelog generation for PR #11422 [ci skip]
2020-03-12 08:25:57 -05:00
41ed18a537
Changes up some lava land ruins spawns ( #11422 )
...
* Update lavaland.dm
* Update lavaland.dm
2020-03-12 14:25:54 +01:00
87928d43ea
stamcrit check for fireaxe afterattack() ( #11426 )
...
* Update twohanded.dm
* Update twohanded.dm
2020-03-12 14:21:47 +01:00
661a898dd9
Automatic changelog generation for PR #11425 [ci skip]
2020-03-12 08:20:52 -05:00
442eb13e75
Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3
...
fixes synthflesh/rezadone dehusk threshold check
2020-03-12 14:20:49 +01:00
166abfb1ee
Automatic changelog generation for PR #11429 [ci skip]
2020-03-12 08:20:31 -05:00
9e3a3dddfd
Merge pull request #11429 from Putnam3145/dynamic-tweaks
...
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
89a87f4b53
Automatic changelog generation for PR #11430 [ci skip]
2020-03-12 08:20:13 -05:00
9e970b4a3e
Merge pull request #11430 from Putnam3145/fix-transfer
...
Tweaks for the transfer vote
2020-03-12 14:20:10 +01:00
3b8f9887a3
Automatic changelog generation for PR #11406 [ci skip]
2020-03-12 08:18:42 -05:00
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
ff264a06a9
Merge pull request #11442 from Citadel-Station-13/kevinz000-patch-5
...
[s] wack
2020-03-11 18:20:15 -07:00
0b6c5b7960
Update twohanded.dm
2020-03-11 18:19:09 -07:00
cdfab524ce
travis
2020-03-11 17:55:51 -07:00
88bdc6d068
Merge pull request #11440 from kevinz000/master_fix
...
fixes master
2020-03-12 01:54:15 +01:00
dbc54ab699
Update actions.dm
2020-03-12 01:47:51 +01:00
fa160d4c3a
Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
...
Fixes flavor text preview on the chatbox.
2020-03-11 17:44:35 -07:00
9533747d36
Automatic changelog generation for PR #11307 [ci skip]
2020-03-11 19:43:25 -05:00
db188f8681
Merge pull request #11307 from kappa-sama/patch-17
...
gets rid of fly species requirement from hulk
2020-03-11 17:43:23 -07:00
6127f6a453
k
2020-03-11 17:41:12 -07:00
14b22f0b67
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
165f9faf2c
Automatic changelog generation for PR #11373 [ci skip]
2020-03-11 19:27:25 -05:00
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -07:00
77c8b789a5
Automatic changelog generation for PR #11408 [ci skip]
2020-03-11 19:26:36 -05:00
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
80b17cff1f
Merge branch 'master' into patch-17
2020-03-11 20:26:13 -04:00
0e1490791c
Automatic changelog generation for PR #11424 [ci skip]
2020-03-11 19:24:05 -05:00
b8642c5622
Merge pull request #11424 from necromanceranne/death_coma_stuff
...
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
2020-03-11 17:24:03 -07:00
fa1aea4ab5
Automatic changelog generation for PR #10327 [ci skip]
2020-03-11 19:01:40 -05:00
69c21f4b76
Merge pull request #10327 from Seris02/tggenetics
...
ports tg genetics
2020-03-11 17:01:37 -07:00
480eb32c68
Merge pull request #11418 from Ghommie/Ghommie-cit615
...
Fix runtimes some more.
2020-03-11 17:01:13 -07:00
0d80c8c169
Merge pull request #11412 from Citadel-Station-13/Ghommie-patch-2
...
RCL inhands wires fix.
2020-03-11 17:01:01 -07:00
e76704bfa3
Automatic changelog generation for PR #11414 [ci skip]
2020-03-11 19:00:49 -05:00
3df171cf99
Merge pull request #11414 from Citadel-Station-13/Ghommie-patch-3-1
...
Fixes mob spawners errors with posibrains.
2020-03-11 17:00:46 -07:00
b311b62919
Automatic changelog generation for PR #11409 [ci skip]
2020-03-11 18:30:55 -05:00
9f681e9a76
Merge pull request #11409 from necromanceranne/taser_nerf
...
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
2020-03-12 00:30:52 +01:00
d30ba9721c
Automatic changelog generation for PR #11410 [ci skip]
2020-03-11 18:28:06 -05:00
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
e41e3a5fbb
Update banana.dm
2020-03-12 00:22:53 +01:00
5c4663d364
Automatic changelog generation for PR #11432 [ci skip]
2020-03-11 11:21:03 -05:00
Kraseo