192f248284
Fills Emergency Tanks to Max
...
Ports Polaris' edit of giving Voxs and dust-huffer their emergency tanks at full capacity rather than suffocate too early.
2019-03-12 18:54:34 -04:00
a0de41f24f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-15
...
# Conflicts:
# README.md
# code/__defines/mobs.dm
# code/__defines/subsystems.dm
# code/_helpers/global_lists.dm
# code/controllers/subsystems/garbage.dm
# code/controllers/subsystems/overlays.dm
# code/datums/datacore.dm
# code/datums/supplypacks/munitions.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/weapons/id cards/station_ids.dm
# code/game/objects/random/random.dm
# code/game/turfs/simulated/floor.dm
# code/game/turfs/simulated/floor_icon.dm
# code/modules/awaymissions/gateway.dm
# code/modules/client/preferences.dm
# code/modules/ext_scripts/python.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/new_player.dm
# code/modules/mob/new_player/preferences_setup.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ_external.dm
# code/modules/organs/organ_icon.dm
# code/modules/organs/robolimbs.dm
# code/modules/reagents/reagent_containers/glass.dm
# code/modules/reagents/reagent_containers/syringes.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-4.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-03-15 22:41:14 -04:00
5212fa152b
Species names should now use defines
2018-03-15 20:24:45 -05:00
5967bb6dc5
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/items/weapons/storage/storage.dm
# code/modules/mob/living/carbon/human/species/species.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-6.dmm
2018-02-18 00:25:36 -06:00
f4d0ec3fb8
Port Bay's survival boxes
...
Includes some tweaks to items that usually come in the boxes to make them more similar to the Bay implementation.
2018-02-16 19:21:15 -06:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
d7f4193618
fixed teshari sprites for back-slot air tank items.
...
Sprites existed but code was missing.
2018-01-15 02:24:46 +00:00
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
cc3397c4fa
Fixes "was unable to be GC'd" when deleting tanks.
2018-01-02 13:13:49 -05:00
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
7695e45e3a
Path Fix
...
Last Issue, I swear to god, I will get sleep tonight.
2017-07-26 03:56:48 -05:00
a52af2947e
Vox Phoron Tank Sprites Suddenly Missing
2017-07-26 03:33:02 -05:00
3a80ffa080
Fixes inconsistent behavior by TTVs and STBs.
2017-07-24 10:28:20 -07:00
b7f5362276
See https://github.com/Baystation12/Baystation12/pull/14404 .
...
(ignore point 13)
2017-07-16 16:03:31 -07:00
c91dc333cd
Some more types which need Destroy to return qdel hints!
2017-06-14 01:13:54 -04:00
48edfb2fdc
Some more types which need Destroy to return qdel hints!
2017-06-14 00:59:32 -04:00
93888221b2
Merge pull request #1690 from VOREStation/polaris-sync-gc
...
tg Garbage Subsystem
2017-06-11 14:39:30 -04:00
0dda35454b
Tank sprite changes
...
Updates to Paradise oxygen tank sprites, and fixes the engineer survival box to have goggles!
2017-06-11 00:08:21 -04:00
5a02b7e5c7
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-10 22:41:51 -04:00
e48b548f2b
More and more Destroy() cleanups all across the board - Return qdel hints.
2017-06-05 23:01:41 -04:00
be9bcf81f0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-03-21 11:22:29 -04:00
83cc019562
Fixes phoron sprites. ( #3100 )
...
* Fixes phoron sprites.
* Re-adds the phoron-tank changes for the vox???
* touches up tank sprites
2017-03-20 19:31:42 -05:00
6e8667e948
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-newpolsync
...
# Conflicts:
# code/game/objects/items/weapons/tanks/tank_types.dm
# code/modules/events/canister_leak.dm
# code/modules/gamemaster/actions/canister_leak.dm
2017-03-13 01:29:01 -04:00
0465613465
Changes tank sprite for Vox
2017-03-08 12:36:43 -06:00
64fd611a2c
Makes Vox spawn with a fancy dancy double emergency Phoron tank
2017-02-23 13:48:50 +00:00
9cd1919fc6
Reverts vox change I made
2017-02-02 14:35:14 -05:00
82d021eb47
Makes vox tank spawn with nitrogen instead of phoron
2017-02-01 15:59:50 -05:00
e23f5c2dd0
Vox airtank fix
2017-01-20 18:04:12 -06:00
2c86a0a465
Returns the Vox, who now breath Phoron
2017-01-06 17:49:39 -06:00
828dacf485
Centralizes weight class definitions
...
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.
Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it. This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files. In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.
The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
8eae6a7dee
(hopefully) last name tweak
2016-07-25 19:50:19 -04:00
8e9676aa26
storage item item_state fix
2016-07-24 00:19:45 -04:00
7192bf08fd
item_state cleanup
2016-07-11 22:31:32 -04:00
beda3185eb
Reverts the second mob clean up because of incomplete implementation.
...
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
df5a0d7941
Mob inventory cleanup
...
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
a628ae2a56
Removed the Vox Pox.
2016-02-20 11:24:19 +10:30
19014807fd
Surface rename of Seromi to Teshari.
2016-02-06 12:50:16 +10:30
58736fb4f6
Renaming Resomi to Seromi.
2016-01-27 14:24:09 +10:30
eef9145486
Revert "Removes Resomi."
...
This reverts commit c9f579e00a
2016-01-27 13:48:48 +10:30
c9f579e00a
Removes Resomi.
2015-12-21 09:56:11 +10:30
4c904dc782
Oxygen tanks now have a visual indicator of their pressure on the item icon.
2015-12-11 15:52:54 +10:30
b60146728c
TTV Refactor
...
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
2015-12-08 17:54:15 +01:00
4f77afece1
Revert 58ef59734f
2015-11-08 10:09:14 -05:00
27feb09a31
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/computer/computer.dm
html/changelogs/.all_changelog.yml
2015-10-11 17:37:01 +02:00
38c6ba3a07
Code relocation.
2015-10-11 17:31:21 +02:00
070ca0adea
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/tanks/tanks.dm
code/modules/holodeck/HolodeckControl.dm
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/setup.dm
2015-10-11 17:17:41 +02:00
d5928d9927
Merge pull request #11260 from mwerezak/ttv
...
Fixes TTV Yield
2015-10-10 09:05:00 +01:00
fa661f998f
TTV Refactor
...
Ensures TTV icon update occurs properly and removes the need for sleep() by
updating tank Destroy() to account for TTVs. Collects duplicated code into
a transfer_valve/remove_tank() proc.
2015-10-08 23:26:05 -04:00
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
5863112d2d
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-09-15 20:31:59 +02:00
TheFurryFeline