Commit Graph

8442 Commits

Author SHA1 Message Date
Alffd
87f2d9701f Fix check with emote on mute 2018-08-29 20:59:17 -04:00
Crazy Lemon
4c1aa6ae35 Merge pull request #9434 from FlattestGuitar/nom-nom-handcuffs
more consistent checks for dressing and undressing your boss
2018-08-29 08:05:13 -07:00
Crazy Lemon
7ed0f2ad0c Merge pull request #9441 from Kyep/spider_obj_fixes
Fixes #7089 - plus other bugs with spider obj attacks
2018-08-29 08:04:04 -07:00
Kyep
032557fa21 Fixes #7089 plus other bugs with spider obj attacks 2018-08-28 17:25:12 -07:00
Unknown
cf9e3f6bef taking items off people is more consistent
so is putting them on people
2018-08-28 11:40:47 +02:00
Unknown
099c144a9e IPC screen color 2018-08-28 11:07:07 +02:00
Crazy Lemon
5b5934f276 Merge pull request #9420 from variableundefined/BorgAndAIRadioFix
Restore radio privacy to oppressed silicons
2018-08-27 23:53:46 -07:00
Crazy Lemon
9630f69edc Merge pull request #8940 from Allfd/shockcollar
Adds shock muzzle
2018-08-27 19:02:41 -07:00
variableundefined
688b510e63 Fixes borg & AI (and PAI) broadcasting what they say on the radio to everyone. 2018-08-26 22:48:35 +08:00
FishStix4Dayz
94b5b26418 deleted extra line of code 2018-08-24 19:20:47 -05:00
FishStix4Dayz
e55d50b199 New Vulp hairstyle 2018-08-23 22:28:51 -05:00
Crazy Lemon
058d339493 Merge pull request #9336 from Kyep/depot_fixes_1
Depot Fixes
2018-08-22 22:33:09 -07:00
Kyep
aad79ee59f fixes depot npc target jam on lockered targets 2018-08-22 13:11:19 -07:00
Kyep
a7c2f854b5 fixes depot syndimobs being immune to melee damage 2018-08-22 12:08:32 -07:00
Birdtalon
15c947a21c replaces equip_to_slot_or_del() with equip_to_slot_if_possible() 2018-08-21 19:00:57 +01:00
Alffd
f48b9bc5be Need to rebase it seems 2018-08-14 00:53:40 -04:00
Alffd
d94957f57d Even more fixes 2018-08-14 00:53:40 -04:00
Alffd
9f95664623 More fixes 2018-08-14 00:53:40 -04:00
Alffd
1c7923f6f7 Changes 3B 2018-08-14 00:53:40 -04:00
Alffd
9be1b8ed19 Changes 3 2018-08-14 00:53:40 -04:00
Alffd
73fc817635 CL changes round 2! 2018-08-14 00:53:40 -04:00
Alffd
b58e83da53 Fixes for CL 2018-08-14 00:53:40 -04:00
Alffd
48bc4ba081 Initial muzzle and emote changes 2018-08-14 00:53:39 -04:00
Kyep
27473c3e3e better fix for boss cheese 2018-08-08 23:02:08 -07:00
Kyep
0fc53de09c fixes reactor sometimes not overloading, also an armory bypass 2018-08-08 14:55:52 -07:00
Kyep
2dd35bc894 Fixes 2018-08-08 10:39:25 -07:00
Crazy Lemon
6a925fb205 Merge pull request #8515 from Kyep/depot
Reworks Syndicate Supply Depot
2018-08-07 09:34:02 -07:00
Kyep
cfce50fe8a moves core to /area/ subtype, bugfix 2018-08-06 23:17:30 -07:00
Crazy Lemon
08044a6b58 Merge pull request #9266 from Kyep/simple_animal_intent
Allows simple_animals to change intent
2018-08-06 21:27:46 -07:00
Kyep
030d2c004e to_chat 2018-08-06 21:21:01 -07:00
Kyep
477912dc72 CrazyLemon 2, more small stuff 2018-08-06 21:19:10 -07:00
Kyep
1f65c9a734 CrazyLemon 1, all the minor issues 2018-08-06 21:08:01 -07:00
Mars
4e86cc9f95 Merge conflict fix and proper text 2018-08-04 15:53:38 +02:00
Kyep
b5852af194 handles pods, double agents, shield phase-through 2018-08-02 16:43:48 -07:00
Fox McCloud
7f2030415f staff of change fix 2018-08-02 13:43:44 -04:00
Kyep
102ff67095 fixes merge conflict 2018-08-01 04:13:22 -07:00
Mars
98d26ff70a Merge conflict resolution 2018-07-29 14:38:11 +02:00
Kyep
da04b48df5 do it via screen/act_intent instead 2018-07-27 17:15:25 -07:00
Kyep
740a35d248 handles default HARM mobs 2018-07-27 15:55:29 -07:00
Kyep
ee0e744a3c Simple animal intent switch 2018-07-27 15:48:20 -07:00
Fox McCloud
2e10eb96d0 Species Refactor Followup 2018-07-27 18:35:01 -04:00
Fox McCloud
76b81b668e Merge pull request #9258 from variableundefined/RoboticAnalyzer
Cyborg analyzer no longer rounds off damage number
2018-07-27 15:26:45 -04:00
Crazy Lemon
1d6c9225e7 Merge pull request #9247 from Fox-McCloud/abductor-update
Abductor update
2018-07-27 12:22:15 -07:00
Fox McCloud
4f10f52c7e tweaks 2018-07-27 14:51:04 -04:00
Fox McCloud
6822ab7506 Merge pull request #9262 from Crazylemon64/snpc_fixes
Fixes prefab SNPC instances
2018-07-27 01:03:29 -04:00
Crazylemon64
ea4cd378b0 Adds initialize returns that I forgot to add in the maploader fix PR 2018-07-26 21:43:27 -07:00
Crazy Lemon
08ff891bc5 Merge pull request #9235 from Fox-McCloud/species-clean-up
Splits up Species Files
2018-07-26 21:42:40 -07:00
Crazy Lemon
705faa3fe8 Merge pull request #9261 from Fox-McCloud/tentative-fix
Fixes Icon Caching
2018-07-26 20:33:07 -07:00
Fox McCloud
ed6a881520 Fixes Icon Caching 2018-07-26 19:03:10 -04:00
variableundefined
2f8db36257 Robot analyzer no longer rounds off damage number 2018-07-26 22:38:36 +08:00