cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 23:49:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
16,402 Commits 9 Branches 26 Tags
fa88663c23c206c187bcdcc0a364ce5f345d9830
Commit Graph
6661 Commits
Author SHA1 Message Date
Chinsky fa88663c23 Merge pull request #4513 from Aryn/master 
Space Lighting Fixes
 2014-03-07 17:51:55 +04:00
Ccomp5950 e8d04262a5 Merge pull request #4524 from Ravensdale/PROTECITON 
Define spelling correction
 2014-03-04 23:11:43 -06:00
Ccomp5950 c066232ab3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-03-04 18:29:03 -06:00
Vetinari 1d62ceddaa Merged Upstream 
This is a big one.
 2014-03-04 22:19:09 +11:00
Mloc f4ca9631b5 Merge pull request #4504 from MrLeebo/severed-limbs-drop-cuffs 
Fractures and severed limbs cause cuffs to fall off
 2014-03-04 10:15:42 +00:00
Ravensdale 9561635942 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into PROTECITON 2014-03-03 20:26:58 -08:00
Ravensdale 50a45b32ae Fixes a define spelling error. 2014-03-03 20:23:21 -08:00
Jeremy Liberman c5261a2796 Wearing masks or straight jackets blocks chewing on your wrists 2014-03-03 20:24:09 -06:00
alex-gh 1c596f2ff2 Despawning in cryo pods no longer prematurely end rev rounds. 2014-03-03 08:57:46 +01:00
Jeremy Liberman d41d3b2b9e Fixes UI glitch when losing cuffs from fractures, resisting, or cult magic 2014-03-02 15:08:55 -06:00
Mloc-Argent d53263a49b Optimizes of /obj/New(), by removing access generation. 
Previously, every single /obj would parse the req_access_txt and req_one_access_txt strings and turn them into a list of numbers for the access system.
This is now done the first time check_access() is called, so only objects that actually use the system will have the lists generated.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-03-02 15:12:56 +00:00
Aryn 2c947e135f Fixed supply shuttle bug wherein the area types were actually tags. 2014-03-02 06:53:11 -07:00
Jeremy Liberman 4025ccbee5 Fractures and severed limbs cause cuffs to fall off. Deranged spessmen can chew their own wrists to break free. 2014-03-01 22:56:47 -06:00
ZomgPonies 61fe10fe3d Efficiency: Joblist 
Conflicts:
	code/__HELPERS/global_lists.dm
 2014-03-01 13:38:55 -05:00
Ccomp5950 5c482f1c8c Merge pull request #4494 from yashaldie/master 
Fixed Borg toggling broadcast mode
 2014-03-01 11:07:41 -06:00
Ccomp5950 77767db800 Merge pull request #4487 from zekesulastin/laser-scalpel 
Laser Scalpels Ver. 1
 2014-03-01 10:55:18 -06:00
DJSnapshot 4492648491 server crash fix based off of https://github.com/tgstation/-tg-station/pull/2943/files 2014-02-28 17:38:58 -08:00
yashaldie 3d7b7a937c Missed some codes... 
Forgot to add some code from a past bug fix i did on my end.
 2014-02-28 05:42:42 -05:00
yashaldie a0bb14f76e borg radio fix 2014-02-28 04:58:49 -05:00
Ccomp5950 9c2e3ef84a Merge pull request #4483 from Loganbacca/chemsmoke 
Chemsmoke tweaks and bug fixes
 2014-02-27 03:42:51 -06:00
Loganbacca ac8f5451e8 Chemgrenade fix 
- If check to handle grenades detonating in a mobs hand correctly.
 2014-02-27 14:09:47 +13:00
Ccomp5950 39383c331a Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-02-26 09:38:40 -06:00
Ccomp5950 c56ec21ee3 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-02-26 09:34:38 -06:00
Loganbacca 53b338060c Chemsmoke tweaks and bug fixes 
- Renamed the variable for the smoke density mechanic to density. Also clamped it to a minimum of 1 so it cant multiply reagents.
- Added some checks so the chemsmoke effect doesn't run if it's in nullspace.
- Removed an unnecessary distance calculation.
- Added a null turf check to prevent runtimes if a really big smoke grenade goes off at the edge of the map.
- Added a check so the reagent copy code doesn't run if there's no reagents to run it on.
 2014-02-27 00:59:01 +13:00
Vetinari 309cd0844d Medbay Area Tweaks 2014-02-26 21:00:11 +11:00
Mloc-Argent f5ab084eac Fixes admin attack logs to show up in-game as well as in the logfiles. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-02-25 20:36:46 +00:00
ZekeSulastin 72eba68bd8 Added laser scalpel items 2014-02-25 15:09:46 -05:00
Ccomp5950 3ab7e8438a Runtime fix: Sparks trying to delete that which does not exist. 
runtime error: Cannot execute null.delete().
proc name: start (/datum/effect/effect/system/spark_spread/start)
  source file: effect_system.dm,204
  usr: Mark Hoover (/mob/living/carbon/human)
  src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
  call stack:
/datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()
runtime error: Cannot execute null.delete().
proc name: start (/datum/effect/effect/system/spark_spread/start)
  source file: effect_system.dm,204
  usr: Mark Hoover (/mob/living/carbon/human)
  src: /datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread)
  call stack:
/datum/effect/effect/system/sp... (/datum/effect/effect/system/spark_spread): start()
 2014-02-25 00:28:00 -06:00
Ccomp5950 e098746209 Runtime fix: RP_Revolution's auto_add_rev_head loves that null. 
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
runtime error: Cannot read null.client
proc name: process (/datum/game_mode/revolution/rp_revolution/process)
  source file: rp_revolution.dm,198
 2014-02-25 00:20:44 -06:00
Chinsky 0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes 
Runtimefixes
 2014-02-25 06:01:59 +04:00
Aryn 130f58a41c ChangeTurf()... We meet again... 2014-02-24 06:39:50 -07:00
Aryn 7f4c4715e7 Lighting seems to be working now. 2014-02-24 05:58:11 -07:00
Aryn ca7d4026b8 Lighting system is too buggy to continue until I know wtf is going on 2014-02-24 05:58:09 -07:00
Ccomp5950 d5951781fd Runtime fix: Alarms keep trying to heat up space. 
runtime error: Cannot execute null.heat capacity().
proc name: process (/obj/machinery/alarm/process)
  source file: alarm.dm,186
runtime error: Cannot execute null.heat capacity().
proc name: process (/obj/machinery/alarm/process)
  source file: alarm.dm,186

over and over and over.
 2014-02-24 01:27:04 -06:00
Ccomp5950 0bcd89360a Runtime fix: I have no UI, and I must close it. 
runtime error: Cannot execute null.close().
proc name: Topic (/obj/item/device/pda/Topic)
  source file: PDA.dm,485
  usr: Garry Myers (/mob/living/carbon/human)
  src: PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering)
  call stack:
PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering): Topic("src=\[0x2003e95];choice=Messag...", /list (/list))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
NeroHarry (/client): Topic("src=\[0x2003e95];choice=Messag...", /list (/list), PDA-Garry Myers (Station Engin... (/obj/item/device/pda/engineering))
 2014-02-24 00:51:57 -06:00
Ccomp5950 1eb66f1f78 Runtime fix blood_DNA length checks when it's possibly null. 
runtime error: Cannot read null.len
proc name: attack self (/obj/item/weapon/melee/telebaton/attack_self)
  source file: swords_axes_etc.dm,156
 2014-02-24 00:47:55 -06:00
suethecake 32de00eed8 Fix to cloned gun issue - now your holster is located on your tactical armor. 2014-02-22 21:50:21 -06:00
Ccomp5950 65b8215ec7 Merge pull request #4465 from Loganbacca/chemsmoke 
Chemsmoke rewrite
 2014-02-22 18:33:43 -06:00
Aryn d6b275ca73 Fixed walls not splitting zones. 2014-02-22 08:16:35 -07:00
Vetinari cb1c247767 Updates 
Medicine Cabinet(s), Acute Doors
 2014-02-22 19:26:42 +11:00
Segrain 05c82c970b Tiny fix. 2014-02-22 06:56:51 +03:00
Segrain 2b9842c113 Smallfix. 2014-02-22 06:56:12 +03:00
Segrain ef3b565f64 Fix for #4458. 2014-02-22 06:53:37 +03:00
Aryn 0089ae6282 Fixed some weird bugs concerning space and the creation thereof. 2014-02-21 08:39:04 -07:00
Aryn f0e4e27821 Fixed a special case with simulated turfs being replaced by space. 
Actually any unsimulated turf, but mostly space.
 2014-02-21 08:39:02 -07:00
Loganbacca 864e097e91 Chemsmoke rewrite 
- Complete rewrite of the chemsmoke spawning code (everything that happens after the reaction to create the smoke).
- Moved it into it's own file since it's a little longer than the old one code-wise.
- Tweaked the smoke sprites; gave chemsmoke directions for more randomization, and tweaked the timing of their animations so they are smooth now.

Most of the code is documented, so you should be able to follow what's going on just reading through it. In short though:
- Chemsmoke now affects a circular area with a variable range depending on the total amount of chemsmoke created (no more 1-of-each-ingredient smoke grenades - sorry).
- The carried reagent volume in the cloud balances itself according to how big the affected area is (larger area, less carried reagent per turf).
- The carried reagent has more volume the closer you are to the centre of the cloud.
- The visual smoke effect scales with how big the affected area is.
 2014-02-22 00:47:08 +13:00
Vetinari 28b84ce8b8 Merge remote-tracking branch 'upstream/dev' into dev 2014-02-21 20:01:33 +11:00
Vetinari db76f164fe Revert "derp" 
This reverts commit 77072625dd.
 2014-02-21 18:17:15 +11:00
Vetinari 77072625dd derp 2014-02-21 18:17:09 +11:00
Vetinari 67ec7739c5 Tweaks 2014-02-21 18:06:05 +11:00