cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,013 Commits 9 Branches 26 Tags
fbfdccebaf50761de01e54e283ab51a34dfd8674
Commit Graph

3164 Commits

Author SHA1 Message Date
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
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
Chinsky
0ba65efd18 Merge pull request #4477 from Ccomp5950/runtimefixes 
Runtimefixes
 2014-02-25 06:01:59 +04: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
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
Chinsky
225b195934 Merge pull request #4454 from Loganbacca/bayfix 
Various fixes
 2014-02-19 04:25:17 +04:00
Loganbacca
b8b1bd82a4 Wardrobe fix 
Fixes #4447

- Added a parent call to each wardrobe subtypes New() proc.
Wardrobes weren't calling obj/structure/closet/New(), so weren't adding items in the same location to their contents when first created.

- Removed wardrobe/New() proc.
So all subtypes don't inherit an extra set of blue uniforms and brown shoes. Only one wardrobe on the map is of this type, and it's on the derelict, so didn't think it was worth making a map change.
 2014-02-18 11:12:27 +13:00
Joey Haas
296e839f03 Fixed issue #4439 (Detomax ignores status of messaging server) 2014-02-17 00:18:28 +01:00
Ccomp5950
4f3c404455 People in lobby won't see PDA messages. 2014-02-13 13:03:13 -06:00
Mloc
09bdc9492a Merge pull request #4410 from Ccomp5950/dna2-cherrypick 
DNA2 Cherry-pick (Dev -> Master)
 2014-02-12 09:54:13 +00:00
Ccomp5950
8ae8949b10 NanoUI PDA - Decreasing initial size of the screen. 
Gonna miss my XBOX-LARGE pda screen.
 2014-02-11 00:56:42 -06:00
Rob Nelson
fa20b9c2ee DNA2 Bug Fixes - Part 2 (CHERRY PICK) 
We discovered that most of the problems were were having was because of BYOND passing lists (e.g. SE and UI) by-ref instead of the assumed by-val.

This commit adds dna.Clone() and (UI|SE).Copy() where needed.  These should be used where DNA or SE/UI lists are COPIED, otherwise changes made in the reference will affect the real strand.

This change also messes with the gene activation logic.

Conflicts:
	code/game/dna/dna2_domutcheck.dm
	code/game/dna/genes/powers.dm
 2014-02-10 22:46:28 -06:00
Ccomp5950
5810970352 Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-10 20:42:32 -06:00
Segrain
8e11dabf96 Bloody feet. 2014-02-09 13:30:28 +03:00
Segrain
b4a8c370ba Colouring before updating. 2014-02-09 13:21:18 +03:00
Segrain
be61c65edd Proper indentation. 2014-02-09 13:12:49 +03:00
Ccomp5950
975433f898 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 
Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi
 2014-01-30 12:14:44 -06:00
Zuhayr
8850a43dcb Fixes #3847 2014-01-30 23:21:00 +10:30
Zuhayr
7a36d1c9bc Fixes #4346 2014-01-30 21:30:58 +10:30
Kilakk
44962760b8 Removed pointless output 
* There's something here about var/revsafe being used for heads/implanted people
... or something like that
 2014-01-24 15:04:41 -05:00
Kilakk
1a7616fb35 Fixes #4322 
* There's probably a much more "modular" way of doing this, but, eh
 2014-01-23 20:53:05 -05:00
Ccomp5950
c028db481e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/reagents/Chemistry-Machinery.dm
 2014-01-23 00:05:53 -06:00
Loganbacca
682dfd5670 More typo fixes 
Missed these in the last commit.
 2014-01-15 20:03:12 +13:00
Loganbacca
c83537a6a9 Sink filling typo 
No more filling the the bucket using the sink.
 2014-01-15 19:13:06 +13:00
Ccomp5950
d5bcef4f8a Uplink fix item spawner fix. 
Probably a merge conflict fix or something but some code got moved to an odd spot.
 2014-01-12 22:37:00 -06:00
Mloc
e826458900 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-01-12 21:55:11 +00:00
Ccomp5950
167671d583 NanoUI PDA optimizations no more sortAtom every tick on every PDA. 
Should be noticably better on large population servers.
 2014-01-11 20:09:11 -06:00
Loganbacca
909928f3f9 Plasma glass stacking fix 2014-01-11 18:14:51 +13:00
Mloc
efa5a600e3 Merge pull request #4252 from RKF45/ears 
Tiny objects on ears
 2014-01-10 13:47:10 -08:00
Chinsky
76dc0c4c49 Merge pull request #4234 from Mloc/bs12-quicklist 
[TG] Optimized and refactored list2text, text2list, and replacetext.
 2014-01-10 11:55:33 -08:00
DJSnapshot
1e4abf785e Merge pull request #4237 from Mloc/bs12-tgstuff 
[TG] Lots of small (and maybe not so small) changes from tg.
 2014-01-09 22:33:28 -08:00
RKF45
16cc421e34 Tiny objects on ears 2014-01-09 23:45:08 +01:00
Mloc-Argent
dfe18845be Merge remote-tracking branch 'upstream/dev-freeze' into dev 2014-01-09 17:42:30 +00:00
Zuhayr
70fe0e02cd Merge pull request #4245 from SkyMarshal/airfixes 
Lots of bugfixes.
 2014-01-09 02:47:20 -08:00
SkyMarshal
d43b2fa492 RCDs no longer create plating with air on it. 
Fixes #3545
 2014-01-08 17:50:59 -07:00
Mloc-Argent
c337e5e5f3 More elegant solution to dirt getting in the way. 
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-08 21:34:15 +00:00
Mloc-Argent
be153d14a3 Fixes for the tg cherrypicks. 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-01-08 20:32:35 +00:00
Kyrah Abattoir
f91b44b47f correct paint can names and plural status, corrected pill box names, corrected lockbox names. 2014-01-08 19:56:03 +00:00
Kyrah Abattoir
98f02be5a6 code/game/object/items/weapons/* lowercase pass 
code/game/object/structure/* lowercase pass (start)

Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/vending_items.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/door_assembly.dm
 2014-01-08 19:56:00 +00:00
Kyrah Abattoir
7315b75cca FIXED: inconsistencies with stack item names. 
CHANGE: stacks are gender = PLURAL by default because it fits.

Conflicts:
	code/game/objects/items/stacks/stack.dm
 2014-01-08 19:48:43 +00:00
Kyrah Abattoir
2f0a0243e9 code/game/objects/items/robot/* lowercase pass 
NOTE: vision modes have to be proper.

Conflicts:
	code/game/objects/items/robot/robot_parts.dm
	code/game/objects/items/robot/robot_upgrades.dm
 2014-01-08 19:47:48 +00:00
Razharas
691e15bb2f Fixes chameleon projector 
Conflicts:
	code/game/objects/items/devices/chameleonproj.dm
 2014-01-08 19:43:27 +00:00
Razharas
3b66f33d14 Fixes morgue trays used by ghosts and what not 2014-01-08 19:39:20 +00:00
Cluwnes Honk
2069a9e83c Personnelly, I feel this pull request was successfull. 
Spelling fixes.

Conflicts:
	code/game/machinery/newscaster.dm
 2014-01-08 19:26:10 +00:00
ChuckTheSheep
533600eaa5 Explosion Optimizations 
Implements a trange that internally checks only turfs and thus less
intensive.

Conflicts:
	code/game/objects/explosion.dm
 2014-01-08 19:21:47 +00:00
Mloc
794be2b31e Fix previous commit for BS12. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2014-01-08 11:49:15 +00:00
YotaXP
68ae21fac3 Optimized and refactored list2text, text2list, and replacetext. 
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm
 2014-01-08 11:41:51 +00:00