cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-26 18:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,961 Commits 7 Branches 0 Tags
b3b51a7c3a57eccbf09db457c1faf8b38aa2324d
Commit Graph

2495 Commits

Author SHA1 Message Date
Anewbe
3997a1510a Merge pull request #3526 from VOREStation/stonedmc-update 
StonedMC Update & Hookup
 2017-06-16 16:22:26 -05:00
Leshana
6a0cc39419 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 and spiders.
* 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-16 13:40:15 -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
7f60e98633 Merge remote-tracking branch 'polaris/stonedmc-update' into stonedmc-update 
# Conflicts:
#	code/_helpers/game.dm
#	code/controllers/subsystem.dm
#	code/controllers/subsystems/garbage.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	maps/RandomZLevels/stationCollision.dm
#	maps/RandomZLevels/wildwest.dm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2017-06-11 15:35:42 -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
Leshana
82e6049821 Actually hooks up the StonedMC to run its subsystems in Polaris 
* Hooks up informing Master the gameticker actually starts and stops the round subsystems will actually fire! What ho!
* We should convert the gameticker as an MC subsystem someday, and probably completely rewrite it while we are at it becuase it is crazy.  But this should bridge the gap until then.
 2017-06-10 19:01:58 -04:00
PsiOmegaDelta
ebe5cc916d Port of @PsiOmegaDelta's Baystation12/Baystation12#16820 
Ports tg's garbage collector subsystem and Destroy() returning qdel hints.
 2017-06-05 22:10:06 -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
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
Anewbe
8ef3829c9a Gives the armblade some armor pen, to differentiate it from the claws 2017-05-22 14:19:17 -05:00
Ben Reeve
6185bbd212 Unified radiation system 2017-05-22 16:24:34 +01: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
ee0a8b7fbe Adds ling claw power 2017-05-15 15:51:21 -05:00
Neerti
5381e55187 Makes code compile. 
Wew.
 2017-05-09 19:04:09 -04:00
Anewbe
801d91ba8b Merge pull request #3421 from Neerti/5/5/2017_technomancer_changes 
More Technomancer
 2017-05-09 17:54:53 -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
Arokha Sieyes
c541122123 Convert to using Mediamanager lobby music 
Update the JSON!
 2017-05-08 02:33:46 -04:00
Anewbe
e93e87b998 Merge pull request #3429 from LorenLuke/Holidays 
Adds two holidays
 2017-05-07 13:09:18 -05:00
LorenLuke
de4de97e69 #3384, but works. 2017-05-07 09:20:10 -07:00
Neerti
b76b2c34a7 More Technomancer 
See PR
 2017-05-05 19:02:48 -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
03ff489f7a Kinda reworks Hyposprays/Autoinjectors 2017-04-30 17:13:00 +01:00
Anewbe
60b42d2aba Merge pull request #3335 from LorenLuke/Sting-Range 
Reworks ranged changeling stings
 2017-04-30 09:17:33 -05:00
Anewbe
3c8088015d Merge pull request #3390 from Neerti/4/28/2017_technomancer_modifiers_and_fixes 
Makes Technomancer use modifiers, modifier changes, fixes a few bugs
 2017-04-28 19:35:32 -05:00
Neerti
ec366d5d74 Makes Technomancer use modifiers, fixes a few bugs 2017-04-28 16:27:51 -04:00
Neerti
974115f187 Merge pull request #3367 from Anewbe/mercheist 
Merc and Heist back up to oldish numbers, heist round ends normally.
 2017-04-26 20:41:55 -04:00
Anewbe
6f914ca160 Merge pull request #3365 from LorenLuke/Changeling-Medhud 
Revived changelings now are alive on medhuds.
 2017-04-26 15:52:58 -05:00
Anewbe
cc8b17e048 Merc and Heist back up to oldish numbers, heist round ends normally. 2017-04-25 18:55:36 -05: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
c4f181bcf4 Revived changelings now are alive on medhuds. 2017-04-24 15:31:11 -07:00
Neerti
d6683be3ce Adjusts Changelings 
See PR
 2017-04-23 13:22:32 -04:00
Neerti
8822263d69 Merge pull request #3331 from Anewbe/cult_armor_tweak 
Buffs cult armor energy rating
 2017-04-19 23:31:13 -04: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
LorenLuke
c099dbdece Reworks ranged changeling stings (see changelog). 2017-04-19 09:45:02 -07:00
Anewbe
93b52c138a Merge pull request #3308 from LorenLuke/Changeling-Respec 
Tweaks Changeling Respecs
 2017-04-19 10:32:13 -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
Anewbe
107f11c829 Buffs cult armor energy rating 2017-04-18 10:35:09 -05:00
LorenLuke
18b716afe3 Changes readaptation numbers and max. Fixes audio bug with enhanced bioelectrogenesis. 2017-04-15 22:16:57 -07:00
Leshana
7a4dc4bf79 Merge remote-tracking branch 'polaris/master' into polaris-sync 
# Conflicts:
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/zresearchlabs.dmm
 2017-04-15 23:14:32 -05:00
Anewbe
1fbef2de5b Merge pull request #3286 from VOREStation/smooth-lighting 
Port tg/paradise/goon soft-edge lighting
 2017-04-15 22:52:42 -05:00
LorenLuke
ca378b7b69 Tweaks Changeling Respecs. 2017-04-15 01:57:49 -07:00
Anewbe
91bec124b8 Merge pull request #3292 from Neerti/4/13/2017_shields 
Changes Shields
 2017-04-14 23:47:23 -05:00
Neerti
c84ab67fd3 Changes Shields 
See PR for details
 2017-04-13 00:36:13 -04:00
Anewbe
d1657e23c2 Ling and Technomancer now have ways to cure infections 2017-04-12 19:15:32 -05:00
Leshana
f2956464b8 Replace direct access of lighting overlays with T.get_lumcount() 2017-04-12 19:11:53 -04:00
Leshana
e8af4afc88 Port tg/paradise/good soft-edge lighting 
Ports https://github.com/ParadiseSS13/Paradise/pull/6161
Its merged in nearly verbatim as far as the lighting module goes.
Changes outside the lighting module are merged based on our codebase.
 2017-04-12 19:11:45 -04:00
Arokha Sieyes
ebb2bf9675 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync2 2017-04-11 21:29:07 -04:00
LorenLuke
faf85774b5 Resisting out of choking grabs isn't 100% guaranteed anymore. Tweaked some ling checks to compensate. 2017-04-11 01:16:03 -07:00
Arokha Sieyes
e7d8af7ae7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync 
# Conflicts:
#	code/modules/client/preference_setup/loadout/loadout_xeno.dm
#	code/modules/mob/mob.dm
#	html/changelogs/.all_changelog.yml
 2017-04-10 20:41:18 -04:00