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
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
Arokha Sieyes
2771747bb2
Radio Tweaks
...
Intercom sprite change, fix centcom headset sprite to be unique, add 'NT' headset.
2017-05-07 23:35:25 -04:00
Arokha Sieyes
199e8f3656
Fix for Uplink Runtimes
2017-05-07 16:51:55 -04: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
Neerti
f4c2dd24ef
Merge pull request #3399 from Yoshax/injectors
...
Kinda reworks Hyposprays/Autoinjectors
2017-05-03 08:23:44 -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
Neerti
ccb5e5700b
Merge pull request #3387 from VOREStation/aro-pol-zzz
...
Stasis Bag and Sleeper Changes
2017-05-02 12:09:33 -04:00
Anewbe
ed472a36d2
Merge pull request #3402 from LorenLuke/Communicator-Video
...
Can view active video calls that you camera'd out of.
2017-04-30 16:55:17 -05:00
LorenLuke
ee5e011c6c
Can view active video calls that you camera'd out of.
2017-04-30 14:39:08 -07:00
Yoshax
03ff489f7a
Kinda reworks Hyposprays/Autoinjectors
2017-04-30 17:13:00 +01:00
Arokha Sieyes
418db00c19
Stasis Bag and Sleeper Changes
2017-04-27 21:47:52 -04:00
Anewbe
9204176d58
Advanced medical stacks now heal some damage
2017-04-26 11:12:08 -05:00
Neerti
d89a3a4498
Merge pull request #3366 from LorenLuke/Self-Handcuffs
...
Can now apply handcuffs to oneself.
2017-04-25 23:43:06 -04:00
Anewbe
eda374cf83
Merge pull request #3356 from Neerti/4/23/2017_ling_nerfs
...
Adjusts Changelings
2017-04-25 22:04:37 -05:00
Arokha Sieyes
80670b420c
Merge current master in
2017-04-25 20:14:38 -04: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
5f9bdc5748
Merge pull request #3349 from LorenLuke/Body-Bag
...
Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags.
2017-04-24 13:43:59 -05: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
d6683be3ce
Adjusts Changelings
...
See PR
2017-04-23 13:22:32 -04:00
Neerti
2c25fcec02
Fixes Circuit Bugs & QoL chances
2017-04-23 09:51:53 -04:00
LorenLuke
b87fb2389f
Adds morgue.dm changes.
2017-04-22 23:36:11 -07:00
Mechoid
c64bfe5e66
Makes the Rapid Service Fabricator use an actual glass, not the parent.
2017-04-22 17:51:21 -07:00
LorenLuke
a3fed84d29
Tweaks bodybag relaymove(). Allows exit from morgue trays while in bodybags.
2017-04-22 09:29:55 -07:00
Neerti
80a3865acf
Radios now work again in-hand or in pocket
2017-04-20 23:39:07 -04: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
Leshana
706ca5d0eb
Ports new floor decals, floor types, and floor sprites from Eris
2017-04-18 23:20:17 -04: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
55d895aa14
Merge pull request #3327 from Atermonera/Translator_Languages
...
Fixes a runtime with borgs and translators
2017-04-17 23:25:01 -05:00
Atermonera
e5e5c446a6
Fixes a runtime with borgs and translators
2017-04-17 21:01:42 -07:00
Anewbe
46d447e478
Merge pull request #3326 from Cerebulon/techoriginsfix
...
Fixes improperly formatted tech_origins
2017-04-17 20:57:28 -05:00
Cerebulon
843a59ca07
Fixes improperly formatted tech_origins for hatchet, scythe, reinforced glass, mechanical trap, kitchen utensils and kitchen knife.
2017-04-17 19:31:01 +01:00
Anewbe
b7751bab10
Changelog, adds the dicecup to the loadout
2017-04-17 12:44:34 -05:00
Anewbe
35d4f2455d
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into dice_thing
2017-04-17 12:27:36 -05:00
MagmaRam
cec43bf3d2
Updates in-game EVA manual
2017-04-17 11:19:39 -05:00
