cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 15:19:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,244 Commits 8 Branches 26 Tags
bd6a8e4d5489aeaed0db8670ea09a3a718d3d12a
Commit Graph

4449 Commits

Author SHA1 Message Date
PsiOmega
86d2fa5f61 Build fixes. 2015-04-28 09:04:00 +02:00
PsiOmega
f760d44127 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
 2015-04-28 08:43:31 +02:00
PsiOmegaDelta
bf43270624 Merge pull request #9015 from Kelenius/ofChemAndOne 
Chemistry update - part one
In spite of the sassy tone.
 2015-04-28 08:39:27 +02:00
Kelenius
d9e2947b32 Updates chemistry colors 2015-04-28 09:23:39 +03:00
PsiOmegaDelta
1e457f6e34 Merge pull request #9009 from Yoshax/icanintosurgery 
Fixes antag surgery kit
 2015-04-28 07:35:58 +02:00
Chinsky
1328414485 Merge pull request #8960 from mwerezak/item-color 
Fixes #8577, cleans up item_color, clothing/under and backpacks
 2015-04-28 06:25:35 +03:00
Chinsky
bf7dc5be9d Merge pull request #8994 from PsiOmegaDelta/AirlockPressure 
Airlocks can now crush more things.
 2015-04-28 06:25:23 +03:00
Yoshax
aa115f5bb2 Fixes antag surgery kit 2015-04-27 16:41:47 +01:00
RavingManiac
89a72fb326 Candle burn time increased to ~30 minutes 
Some fluff added to candle description explaining how they burn in space
 2015-04-27 12:10:54 +10:00
Zuhayr
1c627a94b9 Merge pull request #8991 from Kelenius/ofBotsAndMobs 
Updates bots to be mobs. Several changes.
 2015-04-27 11:29:32 +09:30
mwerezak
549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-04-26 14:53:01 -04:00
PsiOmega
19a981e961 Airlocks can now crush more things. 
Airlocks can now crush mobs, canisters, closets, and mechas.
Fixes #8983.
 2015-04-26 19:29:13 +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
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
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
229f4cb043 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color 
Conflicts:
	code/modules/customitems/item_defines.dm
 2015-04-26 02:04:59 -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
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
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
mwerezak
3acfe5960e Renames inventory slot string key defines 2015-04-23 04:57:03 -04:00
mwerezak
1bbb19297e Implements item_state overrides for back slot, hands 
Updates backpacks to use the item_state overrides where necessary, fixes #8577
 2015-04-23 03:26:18 -04: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
mwerezak
5b037670b3 Removes most instances of item_color 
Notable exception is for clothing/under, those will have to be removed once item_state override is implemented.
 2015-04-22 17:40:27 -04:00
GinjaNinja32
bc6daf5b5f Fixes floor painter white-bot and white-delivery states 
Fixes #8937
 2015-04-22 05:21:03 +01:00
Chinsky
bcfb746465 Merge pull request #8901 from PsiOmegaDelta/ShakeShake 
Structure/table shaking.
 2015-04-21 20:04:41 +03:00
PsiOmega
eaa8e341f9 Makes it possible to shake structures people are climbing on to make them stop. 2015-04-21 17:45:09 +02:00
PsiOmega
f6d0ab1578 Shower curtains no longer lose their default color upon being washed. 
NT has now invested in slightly less budget curtains.
 2015-04-20 14:42:43 +02:00
Chinsky
a3962980ac Merge pull request #8898 from PsiOmegaDelta/eject_cartridge 
Adds a PDA cartridge ejection verb.
 2015-04-19 14:56:59 +03:00
Zuhayr
0b03a389df Merge pull request #8910 from Baystation12/master 
Master into dev
 2015-04-19 17:26:04 +09:30
PsiOmega
c39c929db7 Adds a PDA cartridge ejection verb. 
The most requested feature.
 2015-04-18 18:18:11 +02:00
Chinsky
3819fe8d03 Merge pull request #8747 from Kelenius/ofJarsAndLizards 
The return of the jars
 2015-04-18 17:01:08 +03:00
Chinsky
511d3764e7 Merge pull request #8846 from PsiOmegaDelta/CantClickMeDontClickMe 
Makes objects without moues opacity not appear via alt-click.
 2015-04-18 16:57:01 +03:00
PsiOmegaDelta
0b6affb274 Merge pull request #8877 from Jarcolr/patch-3 
Fixes #8559
 2015-04-18 15:55:45 +02:00
Zuhayr
bc9d1ba38b Merge pull request #8893 from Baystation12/dev-freeze 
Dev freeze into dev
 2015-04-18 21:50:40 +09:30
Jarcolr
1cf3fa4c7a Fixes #8559 
Device.dmi is where the sunflower icon is, this is targeting dev because it is ahead on master on this file.
 2015-04-17 15:55:15 +03:00
PsiOmega
4b040d93ba Continues the painful process of porting Destroy()s, Dels(), and everything else needed for qdel. 2015-04-17 09:47:19 +02:00
GinjaNinja32
159dccbfab Fixes floor painter solid-dark icon 
Fixes #8873
 2015-04-17 03:18:53 +01:00
Kelenius
ec1b6f122c Merge remote-tracking branch 'origin/dev' into ofJarsAndLizards 
Conflicts:
	icons/obj/items.dmi
	maps/exodus-1.dmm
 2015-04-16 19:17:10 +03:00
Kelenius
0c9eb8a112 Minor jar fixes 2015-04-16 17:30:01 +03:00