Zuhayr
1c627a94b9
Merge pull request #8991 from Kelenius/ofBotsAndMobs
...
Updates bots to be mobs. Several changes.
2015-04-27 11:29:32 +09:30
PsiOmegaDelta
967223364d
Merge pull request #8988 from mwerezak/droplimb
...
Adjusts threshold for limb removal due to damage
2015-04-26 19:16:34 +02:00
Chinsky
e0c00bda55
Merge pull request #8973 from mwerezak/inventory2
...
Inventory updates
2015-04-26 20:13:21 +03:00
Chinsky
5f30d0fa9a
Merge pull request #8982 from PsiOmegaDelta/Bullets
...
Adds practice rounds.
2015-04-26 20:06:37 +03:00
Chinsky
7359562e16
Merge pull request #8905 from PsiOmegaDelta/BorgModules
...
Silicon Subsystem update.
2015-04-26 20:06:21 +03:00
Chinsky
946373f8a0
Merge pull request #8975 from PsiOmegaDelta/Thunderdome
...
Custom ambiance music for holodeck programs.
2015-04-26 20:05:58 +03:00
Kelenius
37e2c6e109
Removes a wild unused file
2015-04-26 18:13:10 +03:00
Kelenius
b7a628d53d
Merge branch 'dev' into ofBotsAndMobs
...
Conflicts:
code/game/machinery/bots/cleanbot.dm
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/farmbot.dm
code/game/machinery/bots/floorbot.dm
code/game/machinery/bots/medbot.dm
code/game/machinery/bots/secbot.dm
code/game/objects/items/robot/robot_parts.dm
2015-04-26 17:18:20 +03:00
PsiOmega
fe09ed1a22
Merge remote-tracking branch 'upstream/dev' into BorgModules
...
Conflicts:
code/game/objects/items/robot/robot_upgrades.dm
code/modules/mob/living/silicon/ai/subsystems.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +02:00
PsiOmega
9df5048dbc
Makes it possible for borg modules to include specific subystems.
2015-04-26 15:42:36 +02:00
Kelenius
baf19eb862
Merge remote-tracking branch 'origin/dev' into ofBotsAndMobs
2015-04-26 15:47:38 +03:00
Zuhayr
8e0d0900d9
Merge pull request #8875 from PsiOmegaDelta/TheSummoning
...
Destroy/qdel
2015-04-26 22:14:07 +09:30
Kelenius
6d1614cb7a
Updates bots to be mobs. Several changes.
...
General:
Bots are now /mob/living/bot. They support player control fully. Just in
case an admin feels like letting a ghost take control of beepsky or
something.
Since they are bots, spooders and whatnot will attack them.
They now don't need an open panel to be emagged.
Spawns replaced with do_after, meaning that they will stop
injecting/cleaning/repairing/arresting if pulled away.
Medbot:
Emagger is added to ignore list.
Will now inject spaceacilin regardeless of disease type and level.
Previously: only if disease was past stage 1 or airbone.
Cleanbot:
Patrolling rewritten. They now find a closest beacon, and go to the NEXT
beacon after the closest one.
They will not wiggle out when pulled.
They will now ignore (for a while) the gibs they make if odd button is
pressed.
They will now freely claim cleanables. Previously, they would not target
ones targeted by other bots.
Floorbot:
This was a helluva buggy one.
They will now build bridges (but still won't do random repairs) in space
area.
They will now build bridges even if the tile directly next to them in
that direction is tiled.
They will now ignore for a while a tile they can't reach. This is to
stop them from hopelessly targeting tiles under grilles for upgrades and
getting stuck.
They will now slowly (200 ticks for a tile) build new tiles on their
own.
They will now preserve tile's icon when repairing it like a player
would.
They will now place first rods, then tile when fixing space breaches.
Rod costs two tiles.
When emagged, they will first always tear off the tile, then will (over
triple the normal amount of time) breach the tile to space. There are
noticeable warnings for both actions.
Secbot:
Will no longer run away to patrol when panel is open.
Now deals stamina damage instead of instastuns.
Small delay between approaching the target and stunning them.
Laserbots axed.
Removed their weird EMP act.
Will no longer stun lying people, just cuff.
They will also demand surrenderring (lying down) before smacking you. If
target moves, or 5 seconds pass, it will attack.
Farmbot:
It's alive!
It has settings to: water trays, refill its own water, uproot weeds, add
nutriment (ammonia, internal synthesizer), collect produce, and remove
dead plants.
2015-04-26 15:30:11 +03:00
PsiOmega
e54fbcb9ec
Cleans up borg module code and responsibilities.
2015-04-26 12:00:30 +02:00
mwerezak
b20f604d0c
Adjusts threshold for limb removal due to damage
2015-04-26 01:58:52 -04:00
mwerezak
78a02c705b
Removes unnecessary and out of place item dropping in human icon code.
2015-04-25 13:55:47 -04:00
mwerezak
4829f1d82d
Adds calls to mob_can_unequip() where appropriate
2015-04-25 13:55:24 -04:00
mwerezak
3a00fce32b
Refactors mob_can_equip(), adds unequip checks
2015-04-25 13:54:59 -04:00
PsiOmega
4a35631af1
Attempts to save Yosh's code.
2015-04-25 16:39:09 +02:00
PsiOmega
d7bbc6f1c3
Makes it possible to define custom ambiance music for holodeck programs.
...
Cleans up holodeck code. Revives an old SS13 track, THUNDERDOME!
2015-04-25 10:53:14 +02:00
mwerezak
e50043fe99
Updates a few mask body cover flags, allows breath masks to be adjusted in hand
2015-04-24 22:00:51 -04:00
Zuhayr
173329f675
Merge pull request #8968 from Jarcolr/signed
...
Adds 9 new bar signs.
2015-04-25 03:09:35 +09:30
PsiOmega
1fea589ad7
Merge remote-tracking branch 'upstream/dev' into TheSummoning
...
Conflicts:
code/game/machinery/cryopod.dm
code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega
e7d85f8edc
Adds Destroys.
2015-04-24 17:11:14 +02:00
Jarcolr
28c037b6ce
Adds 9 new bar signs.
2015-04-24 17:35:07 +03:00
PsiOmega
1ae0ad6d92
Updates the atom_pool, now datum_pool, to handle any datum object.
...
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
PsiOmegaDelta
ee88da4cea
Merge pull request #8966 from Baystation12/master
...
Dev
2015-04-24 09:20:16 +02:00
Chinsky
60e7aacf79
Merge pull request #8951 from Dennok/patch-15
...
floorlayer
2015-04-24 10:04:29 +03:00
Chinsky
e0da322ee3
Merge pull request #8956 from mwerezak/gametime
...
Makes crit oxyloss and malf AI timer run in gametime instead of realtime.
2015-04-24 10:03:06 +03:00
Chinsky
2159045b81
Merge pull request #8879 from Dennok/patch-6
...
Fix speed and add rotate()
2015-04-24 10:01:13 +03:00
Zuhayr
24175051a2
Merge pull request #8961 from mwerezak/limb-augments
...
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
2015-04-24 16:15:16 +09:30
mwerezak
0a7fd34f3f
Limb augments no longer prevent putting on jumpsuits
2015-04-23 11:27:16 -04:00
mwerezak
7a6a54b671
Fixes Snapwalk's Limb Augment item being removable through the inventory panel
...
I haven't heard of any issues on the server about this, but it's probably best to prevent them from being removed.
2015-04-23 08:25:49 -04:00
PsiOmega
b9f8b0b8aa
Re-shuffles huma/say(). Removes non-existing map variables.
2015-04-23 13:36:13 +02:00
PsiOmega
eee67109d1
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/say.dm
2015-04-23 13:15:43 +02:00
PsiOmega
2aa9a70496
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-04-23 12:59:47 +02:00
Zuhayr
f06326556a
Merge pull request #8838 from Dennok/patch-5
...
Pipelayer
2015-04-23 20:03:20 +09:30
Dennok
dfa0735c1d
Remove .contents in loop.
2015-04-23 11:59:34 +03:00
mwerezak
7a8ae91c6a
Makes crit oxyloss and malf AI time run in gametime instead of realtime.
2015-04-23 04:42:58 -04:00
Zuhayr
c7ec25e8f8
Merge pull request #8855 from comma/soundenv
...
Sound environments
2015-04-23 17:04:30 +09:30
Zuhayr
3fc9260187
Merge pull request #8954 from GinjaNinja32/diona_speech
...
Fixes dionaea always using the verb "says".
2015-04-23 17:02:20 +09:30
GinjaNinja32
07cc28af8e
Fixes dionaea always using the verb "says".
...
Not sure why, but speech_problem_flag is being set to 1 for dionaea, and only dionaea.
Fixes #8952
2015-04-23 08:03:07 +01:00
Chinsky
392cc1b0bb
Merge pull request #8938 from GinjaNinja32/floorpainter
...
Fixes floor painter white-bot and white-delivery states
2015-04-23 09:20:13 +03:00
Chinsky
df21e9fc2e
Merge pull request #8921 from PsiOmegaDelta/DirtyEngineers
...
Shower curtains no longer lose their default color upon being washed.
2015-04-23 07:34:44 +03:00
Chinsky
71ffa782c4
Merge pull request #8914 from PsiOmegaDelta/BadMove
...
Ensures new players cannot ghost by moving.
2015-04-23 07:34:34 +03:00
Chinsky
6cc8be6d90
Merge pull request #8936 from Dennok/patch-14
...
Automatic CableLayer
2015-04-23 07:34:00 +03:00
Dennok
813109af88
Add span classes
2015-04-22 23:30:46 +03:00
Dennok
b5317f398a
Create floorlayer.dm
2015-04-22 23:16:20 +03:00
Zuhayr
b10a7e9fef
Merge pull request #8924 from volas/striphtml
...
Return strip_html_properly() back
2015-04-23 02:12:38 +09:30
PsiOmega
4ce1ec1f3d
Pipelayer feedback.
...
Adds span use. Updates and adds visible messages as necessary.
Corrects more instances where on was used instead of a_dis.
2015-04-22 16:49:54 +02:00
