Commit Graph

2538 Commits

Author SHA1 Message Date
Verkister
7333ea008f Taur and borgo feature shieet!
-Added a counter for janihound to keep track of how much crap it's ate.
-Lowered janigut capacity to 25 items.
-Made mice edible for the borgo.
-Gave a gentle touch to the wolftaur sprites. (more types later?)
-Added a saddlebag version that fits itself for every quadtaur.
-Added a robust combat aesthetic saddlebag as a childtype to the forementioned.
2017-07-03 21:05:17 +03:00
Arokha Sieyes
4419d5dc9c Merge pull request #1734 from VOREStation/chemsmoke-fix
Fixes objects using walk_to() not being able to be garbage collected.
2017-06-15 19:12:16 -04:00
Leshana
f60c024b2a Fixes objects using walk_to() not being able to be garbage collected.
* Okay evidently walk_to(A, B) doesn't stop when A reaches B, but keeps running in the background forever until it is manually canceled!  Therefore in order to be garbage collected, we must cancel walking on any object that might have initiated it.
* Fixes this on chemsmoke, spiders, and aiholos.
* The same story applies to walk_towards; fixed for dust, meteors and immovablerod, and also to walk_away; fixed for flashbangs.
* Also fixed chemsmoke actually getting qdeled at the right time.
2017-06-15 18:46:39 -04:00
Leshana
48edfb2fdc Some more types which need Destroy to return qdel hints! 2017-06-14 00:59:32 -04:00
Arokha Sieyes
93888221b2 Merge pull request #1690 from VOREStation/polaris-sync-gc
tg Garbage Subsystem
2017-06-11 14:39:30 -04:00
Arokha Sieyes
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
Leshana
5a02b7e5c7 More and more Destroy() cleanups all across the board - Return qdel hints. 2017-06-10 22:41:51 -04:00
PsiOmegaDelta
7b47590645 Port of @PsiOmegaDelta's Baystation12/Baystation12#16820
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
2017-06-10 22:41:51 -04:00
Yoshax
f154683662 Removes the snowflake human defined verbs from the majority of the reagent implants 2017-06-08 21:52:56 +01:00
Arokha Sieyes
58ee6891f2 Additional Work on NIFs
Squashed commits:

[9563a9a] All the stuff I forgot to commit
2017-06-06 01:00:46 -04:00
Leshana
197a648795 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
# Conflicts:
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Anewbe
9d8f4cfa53 Fixes Death Alarms 2017-05-31 19:38:07 -05:00
Spades
3ff9d441f9 Finishes fixing ammo inconsistencies 2017-05-27 04:39:49 -04:00
Arokha Sieyes
93770b3be7 Changes emergency box to have goggles, mask, and O2 tank in it.
Just goggles for synths.
2017-05-27 03:10:43 -04:00
Spades
8579adcc53 Naming convention of ammo is now consistent
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Arokha Sieyes
d3d180f739 Merge pull request #1497 from VOREStation/aro-tether-wip
Various Tether Fixes
2017-05-21 00:35:52 -04:00
Arokha Sieyes
67574a8bcb Makes survival box correctly hold gas mask and one tank 2017-05-20 22:26:06 -04:00
Arokha Sieyes
3a856f5bad Merge pull request #1493 from VOREStation/aro-tether-wip
Tether Map
2017-05-20 17:19:32 -04:00
Leshana
e4becce7bf Added VOREStation comments to our custom lines that were missing them and removed debugging code. 2017-05-20 16:57:33 -04:00
Yoshax
3d63880041 Adds defines cause who wants problems 2017-05-20 18:11:20 +01:00
Arokha Sieyes
d6676912bd Gas mask in survival box 2017-05-20 01:36:24 -04:00
Leshana
5ae26332fa Merge branch 'master' into aro-tether-wip
# Conflicts:
#	code/ZAS/_docs.dm
#	code/game/area/areas.dm
#	code/game/objects/explosion.dm
#	code/modules/holodeck/HolodeckControl.dm
#	code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Anewbe
0bfc6de678 Trashbag can hold more 2017-05-13 10:20:45 -05:00
Leshana
4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe
42fe5d9ed6 Merge pull request #3412 from VOREStation/pool-closed
Removes the datum pool, as it is not performant.
2017-05-08 17:21:24 -05:00
Leshana
44ff1a70c6 Removes the datum pool, as it is not performant.
* Creating new objects is cheap, in fact comparable to the cost of getting it out of the pool, so it doesn't help there.
* Placing items in the pool is far more expensive than letting them garbage collect due to the resetting of vars and such.
2017-05-04 01:58:33 -04:00
Yoshax
40be042005 Add's Tempest's custom implant item (#1461)
* Implant stuff

Does more implant stuff

Does even more implant stuff

EVEN MOAR IMPLANT STUFF

Adds Tempest's custom fluff implant along with the generalized parent type

* Changes implant to just use its own reagents holder rather than a beaker, thanks Leshana

* Last commit maybe? Yay?
2017-05-03 22:09:07 -04:00
Neerti
fedef20a53 Merge pull request #3312 from Anewbe/dice_thing
Adds the Liar's Dice game
2017-05-03 16:02:18 -04:00
Leshana
12bc03157a Adds the Algae Oxygen Generator
* This device converts CO2 to O2 using power and "algae".  The extra carbon is a byproduct in the form of "graphite"
* This is intended for virgo3b, which has no oxygen in its atmosphere but enough CO2 for us to just extract it.
2017-05-03 01:54:55 -04:00
Anewbe
100ab0528f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing 2017-05-02 11:13:53 -05:00
Yoshax
03ff489f7a Kinda reworks Hyposprays/Autoinjectors 2017-04-30 17:13:00 +01:00
Arokha Sieyes
055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
LorenLuke
c0be57b200 Adds adjacency check. 2017-04-25 10:55:21 -07:00
LorenLuke
3c4ff5e0bb Can now apply handcuffs to oneself. 2017-04-24 15:43:07 -07:00
Anewbe
66f432925e Merge pull request #3337 from Yoshax/tapedatebatehate
Changes tape coloring + slight rework
2017-04-24 10:01:00 -05:00
Anewbe
08dedaaf98 Merge pull request #3353 from Neerti/4/21/2017_circuit_fixes
Circuit Bugfixes & QoL
2017-04-23 17:08:12 -05:00
Neerti
6dbff1ee83 Adds Drone Identification Cards
Drone FBPs now spawn with an EIO issued ID alongside their NT ID card.
Also makes the bartender's permit automatically name itself when created by the job_controller.
2017-04-23 16:30:32 -04:00
Neerti
2c25fcec02 Fixes Circuit Bugs & QoL chances 2017-04-23 09:51:53 -04:00
Mechoid
c64bfe5e66 Makes the Rapid Service Fabricator use an actual glass, not the parent. 2017-04-22 17:51:21 -07:00
Anewbe
7294e0c46b Merge pull request #3302 from Anewbe/pipe_sprite_issue
Pipe sprite issue
2017-04-20 11:45:16 -05:00
Anewbe
e2448a19dc Merge pull request #3315 from LorenLuke/Tape
Allows placing tape masks/restraints back on the roll.
2017-04-20 11:45:00 -05:00
LorenLuke
f85fe86fa7 Addresses @MagmaRam's concerns. 2017-04-19 18:37:21 -07:00
Yoshax
c9c046913f Changes tape coloring + slight rework 2017-04-19 19:37:56 +01:00
Neerti
e951ff344e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 4/18/2017_modifier_system_and_lings 2017-04-19 13:47:57 -04:00
Anewbe
9d2df21777 Merge pull request #3328 from Neerti/3/14/2017_makeshift_armor
Adds Makeshift Armor
2017-04-19 10:13:20 -05:00
Neerti
ea6128f986 Adds Modifier System, Changes Some Ling Stuff
Adds a fairly simple system that allows adjusting various numbers like max health, incoming damage, outgoing melee damage, etc.  The nice part is that changing certain variables this way (like max health) is a lot safer than manually setting the max health var directly.
Changes a lot of short lines of code to point towards a variable's getter or setter helper instead of reading the var directly so the modifiers can work.
Endoarmor, delayed toxin sting, Enfeebling sting, and recursive adrenaline overdose now use the modifier system.
Enfeebling sting now only lasts two minutes, from five minutes, however it now also reduces the victim's melee damage by 25%/50%, and increases the damage they suffer by 10%/35%, for normal and recursive respectively.
Delayed Toxin Sting's effects are now felt all at once instead of over the course of a few minutes.
2017-04-18 21:23:59 -04:00
Leshana
5dac8b91b6 Merge branch 'master' of ../Polaris into polaris-sync 2017-04-18 19:35:59 -04:00
Neerti
6bd0f8742e Finished coding makeshift armor. 2017-04-18 03:16:10 -04:00
Anewbe
46d447e478 Merge pull request #3326 from Cerebulon/techoriginsfix
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00