kevinz000
8bc8ea71ea
Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
...
Electrostaff Sprite Fix
2020-03-17 09:25:44 -07:00
kevinz000
1585b34e41
Merge pull request #11484 from Citadel-Station-13/Ghommie-patch-1
...
Fixing a couple issues with recyclers.
2020-03-16 13:23:46 -07:00
kevinz000
b062c76ca7
Merge pull request #11485 from Ghommie/Ghommie-cit625
...
Fixing a little issue with the musician trait etcetera.
2020-03-16 13:23:25 -07:00
kevinz000
fd7bfaba06
Merge pull request #11480 from Ghommie/Ghommie-cit623
...
Banana pies, beams. runtime errors and warnings.
2020-03-16 13:22:49 -07:00
kevinz000
3c97782a87
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
...
mining borg nerfs - "they should be outclassed lategame"
2020-03-16 13:22:23 -07:00
necromanceranne
5eb93eaa56
And these too
2020-03-17 02:49:27 +11:00
necromanceranne
b5872bba63
Pretty sure this should now use the correct sprites
2020-03-17 02:43:44 +11:00
kevinz000
8fdb1e5964
Merge pull request #11465 from Seris02/duffelbagholding
...
duffel bags of holding
2020-03-16 06:12:40 -07:00
Seris02
b8e8a81d1c
there
2020-03-16 20:49:10 +08:00
Hatterhat
1fe67d5ce9
a finger of the monkey's paw curls.
2020-03-16 01:35:47 -05:00
kevinz000
fae84f9ee6
Merge pull request #11462 from Ghommie/Ghommie-cit621
...
Fixing some bug reports.
2020-03-15 23:03:59 -07:00
Seris02
259bb03969
fixes the swapping of buttons ( #11475 )
2020-03-16 01:57:55 +01:00
Ghommie
5e5bdec85d
More runtime errors.
2020-03-16 01:55:02 +01:00
Ghommie
8af3d0e2fa
Fixing a little issue with the musician trait etcetera.
2020-03-16 00:09:03 +01:00
Ghom
2b9f352a14
Fixing a couple issues with recyclers.
2020-03-15 22:12:55 +01:00
Hatterhat
802d37a399
borgs should be outclassed lategame and not hunt
2020-03-15 15:55:31 -05:00
Ghommie
b453a25e14
Something about banana pies, runtime errors and warnings.
2020-03-15 15:41:32 +01:00
Ghommie
5bfbcd0948
Fixing some GetElement runtimes.
2020-03-15 15:12:35 +01:00
Ghom
d8a6e9b94f
Merge branch 'master' into Ghommie-cit621
2020-03-15 13:07:45 +01:00
kevinz000
195a3b593b
Merge pull request #11458 from Trilbyspaceclone/patch-310
...
Buffs borg hypos - Anti-radiation addition
2020-03-14 22:21:32 -07:00
kevinz000
4d79230f87
Merge pull request #11467 from Kraseo/i-love-spaceruins
...
Adds a blacklist to contractor dropoff areas
2020-03-14 22:11:21 -07:00
kevinz000
e73e1b03ec
Revert "Stunbaton disarm mode also works on disarm intent now" ( #11446 )
2020-03-14 23:14:57 +01: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
Kraseo
f8a365490b
FUCK²
2020-03-14 13:15:09 +01:00
Kraseo
3f44882c1a
FUCK
2020-03-14 13:13:26 +01:00
Kraseo
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
Seris02
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08: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
Ghommie
1d51ac5ff2
Fixing some bug reports.
2020-03-14 02:34:25 +01:00
Trilbyspaceclone
6993dfde2a
Now stocked at your local robotics
2020-03-13 18:29:46 -04: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
