5c4bde965a
Merge pull request #5304 from VOREStation/vplk-reverse-all_atoms
...
Reverse use of global lists where they hurt performance.
2018-05-28 15:55:55 -04:00
1222e5d0d6
Merge branch 'master' into hangryrat
2018-05-28 15:08:53 +03:00
b96aec1e52
SYNC: Missed another closet (typo)
2018-05-27 19:53:45 -04:00
1437123502
SYNC: Missed one
2018-05-27 19:43:39 -04:00
8f8c41a7c1
SYNC: Correct vorestation closets/crates to use new system
2018-05-27 19:33:34 -04:00
2d89d63c09
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-05-27-2018
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/l3closet.dm
# code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
# code/game/objects/structures/crates_lockers/closets/secure/medical.dm
# code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/crates_lockers/closets/utility_closets.dm
# maps/southern_cross/structures/closets/misc.dm
# maps/submaps/surface_submaps/wilderness/DoomP.dmm
# vorestation.dme
2018-05-27 19:26:12 -04:00
be5c144a16
Ports Baystation12 newest item pickup animations. Fancy! ( #5302 )
...
* fixed photos
* Added item pick up animation
* Revert useless commit
* Removed unnecessary extra define, made sure ghost object deletes itself after animation, changed planes.
2018-05-27 11:54:36 -05:00
e1fe4d5a5d
Merge pull request #5293 from VOREStation/pol-closets
...
Makes closets/crates like boxes
2018-05-26 15:24:45 -07:00
f1b00c9e26
Merge pull request #5292 from Anewbe/crate_layer
...
Crates should always appear below their contents
2018-05-25 16:25:31 -07:00
6b42df0685
Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync-05-25-2018
...
# Conflicts:
# code/__defines/misc.dm
# code/controllers/master_controller.dm
# code/game/machinery/computer3/computers/card.dm
# code/game/objects/items/devices/communicator/UI.dm
# code/game/objects/items/stacks/medical.dm
# code/game/objects/structures/signs.dm
# code/modules/admin/admin_verbs.dm
# code/modules/client/client defines.dm
# code/modules/client/client procs.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/events/radiation_storm.dm
# code/modules/mining/machine_processing.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/simple_animal/animals/bear.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/animals/parrot.dm
# code/modules/mob/mob.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
# code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
# code/modules/reagents/reagent_dispenser.dm
# config/example/config.txt
# html/changelogs/.all_changelog.yml
# interface/skin.dmf
# maps/southern_cross/southern_cross-1.dmm
# vorestation.dme
2018-05-25 13:23:47 -04:00
9bc6663930
Crates should always appear below their contents
2018-05-24 17:24:14 -05:00
f9b409549e
Makes closets/crates like boxes
...
Gives them a 'starts_with' (well, renames the existing one. Someone ported it but never actually applied it anywhere).
2018-05-24 17:26:17 -04:00
73450f337d
Merge pull request #5284 from Anewbe/item_zoom
...
Swapping hands cancels zoom
2018-05-24 13:19:36 -07:00
03e709d92f
Merge pull request #3739 from Novacat/MiscTweaks
...
New Explorer Gear
2018-05-24 09:18:51 -04:00
2c1ad0076f
Requested Fixes
2018-05-22 12:49:41 -04:00
0647b05cd3
Swapping hands cancels zoom
2018-05-21 23:17:46 -05:00
7e44e95d24
Corrects some plane and layer issues
2018-05-20 18:41:21 -05:00
7ec5adf010
Remove some missed spare helmets
...
Fixes #3724
2018-05-18 14:42:29 -04:00
927050ce44
Fix various syntactic problems
2018-05-16 21:43:18 -07:00
1a29f5f009
Merge pull request #5264 from VOREStation/pol-ssao-ex
...
SSAO object excludes
2018-05-16 19:28:39 -05:00
eabfa03891
Laser pointers ( #5257 )
...
* Laser pointers
Adds laser pointers, ported from tg/oldaurora (but heavily modified). They can be found in the loadout, as well as made by science. Science can also upgrade them, which makes them occasionally useful for blinding people, too.
The bugfixes which make several of the features work properly will come in a separate commit.
* Three fixes
Cats now have resting sprites for all 4 directions, instead of just east. This was needed to make cats look like they're pouncing on the laser dot.
Cameras can now be EMPed more than once, and EMPs actually are able to disable them now. This was needed for the shining lasers into cameras feature.
Flash_eyes() now actually displays a flashing animation on your screen when you get flashed (except for silicons, who for some reason are excluded from this unless EMPed). This was needed for laser pointers to have a temporary "blinding" effect when shone into someone's eyes.
(removes errant debug message too, whoops)
* Nerf
Reduced chances of laser pointers doing anything useful on silicons.
Also, fixes a duplicated proc, oops.
* Requested changes
Minor changes as requested - 'cell' to 'diode', view() to viewers(), range() to viewers().
Stops buckled or dead cats from reacting to laser pointers. Zombie cats are fun, but no.
Also, does another small nerf to the effects on silicons.
2018-05-14 15:22:19 -07:00
5d73584fa3
Adds the Statue - A hostile mob, that moves only when you don't see it ( #5108 )
...
* Statue
* Statue done!
* Testing map removed
* Grammar fix + ignoring creator
* Fixed typos, change range to oview, thanks to Atermonera
* made changes that I missed
* Nightvision handling
* diverse blind messages + requested changes
* Bugfixes, added isSynthetic to bots
* commentaries + PoI
* Finalized POI and statue
* removed misclick
2018-05-14 15:21:04 -07:00
bdfa34c911
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:54:10 -04:00
91f0c05a4b
SSAO object excludes
...
Moves several things onto a new plane/layer to keep them from getting the SSAO shadows so it looks nicer.
2018-05-14 11:38:22 -04:00
ba6a2b5641
Merge pull request #3668 from VOREStation/polaris-sync-2018-05-01
...
Polaris Sync 2018-05-01
2018-05-13 23:20:18 -04:00
4706bf1801
Resolve shower curtain/steam layering issue
...
Reported in https://github.com/VOREStation/VOREStation/issues/3594 , curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
2018-05-12 15:29:17 -04:00
c4f9017c76
Rename snake to giant snake
...
To prevent mistakes like this in the future!
2018-05-10 14:26:18 -04:00
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
4d028ee0f3
Removes my incompetence.
...
Re-adds my incompetence.
2018-05-08 18:41:47 -07:00
3a2f21ca31
Weak mobs (Below 10 damage output) cannot smash destroyable structures like Closets.
2018-05-08 16:19:44 -07:00
86e413bf00
Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
...
Removes taur suits
2018-05-08 19:09:29 -04:00
ba5bfa00bb
Merge pull request #3583 from Verkister/chompychomp
...
Adds a funky fresh feature to beartraps.
2018-05-05 08:32:38 -04:00
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
e47fe15fbf
Fixes a comment that caused developers to scratch their heads.
...
Glass has a hardness of 30 https://github.com/PolarisSS13/Polaris/blob/master/code/modules/materials/materials.dm#L433
Thrown_force_divisor multiplies by 1.5.
WHY THE HELL IS THIS A MULTIPLIER INSTEAD OF A DIVISOR ???? WHAT MADMAN NAMED THESE VARIABLES? https://github.com/PolarisSS13/Polaris/blob/master/code/game/objects/items/weapons/material/material_weapons.dm#L56
p.s: Marble spear does 50 damage per hit. may wanna nerf that. It's a 2 tile attack that does 50 damage.
When thrown, marble spear does 39 damage, since it multiplies the blunt damage (26) by 1.5
2018-05-03 22:44:07 -04:00
2a16467f8a
Merge pull request #5219 from VOREStation/vplk-nanoui-multi-template
...
NanoUI multiple templates example.
2018-05-03 11:12:56 -07:00
70b23e905e
Merge pull request #5209 from VOREStation/pol-medsound
...
Ports the medical item sounds from Bay
2018-05-02 22:11:03 -05:00
cd2a538526
Merge pull request #5207 from Novacat/bluespace_duffle
...
Dufflebag of Holding
2018-05-02 22:41:27 -04:00
615928c31f
Merge branch 'master' into hangryrat
2018-05-02 10:48:57 +03:00
847590758b
Merge pull request #5233 from VOREStation/pol-vs-3594
...
Resolve shower curtain/steam layering issue
2018-05-01 13:02:16 -07:00
c3ac0870b6
Merge pull request #5235 from VOREStation/pol-vs-3611
...
Fix wonky PDA eject messages
2018-05-01 13:01:26 -07:00
44cc2e26c7
Merge pull request #5229 from Neerti/4/29/2018_remove_world_REMOVE_WORLD
...
for(var/bad_code in world)
2018-05-01 13:00:18 -07:00
b75b3c539e
Merge pull request #5226 from Lorwp/drillmeta
...
Destroys Drill meta 2: Electric Boogaloo
2018-05-01 12:38:19 -07:00
1db4c4b677
~Promethean Tweaks: The one with the chemicals, and the other thing. ( #5201 )
...
* Promethean Tweaks Round Howevermany We're On Now
* Tweak again. Drinks only plink damage that can be regenned. Multiple drinks, or other sources of tox will still mean these are dangerous.
* Add Blurb other than just "What has science done?"
* Adds the changelog.
* Fixes the stupid.
* Fixfix @ Ater
2018-05-01 12:23:47 -07:00
7eaff9b3e0
Merge pull request #5222 from VOREStation/pol-freezer
...
Increase zealousness of Portable Freezer item whitelist
2018-05-01 10:18:34 -05:00
ce5c7619b9
Fix wonky PDA eject messages
...
As reported in https://github.com/VOREStation/VOREStation/issues/3611 , attempting to eject a cart on a PDA when there's no cart tells you that you can't do that while you're restrained, which isn't very explanatory.
2018-04-30 15:39:48 -04:00
1183e943b1
Merge pull request #3579 from Very-Soft/underdark-bones
...
Adds warning signs to the entrance of the underdark
2018-04-30 15:07:04 -04:00
f8d6449bc1
pathing update
2018-04-30 20:30:16 +03:00
28c300359b
Resolve shower curtain/steam layering issue
...
Reported in https://github.com/VOREStation/VOREStation/issues/3594 , curtains and steam layer under mobs due to the plane update. This fixes that, and causes them to layer correctly.
2018-04-30 12:50:47 -04:00
be73b8c36a
for(var/bad_code in world)
...
Removes a very large amount of world loops.
Adds a macro to painlessly generate a global list, and the needed code to modify the list when an object is made or deleted automatically.
Cleans up some commented out code.
2018-04-29 17:55:04 -04:00
5715e58691
Adds signs and bones to the underdark!
2018-04-28 23:31:05 -04:00
Atermonera