Commit Graph

12968 Commits

Author SHA1 Message Date
Mloc
09bdc9492a Merge pull request #4410 from Ccomp5950/dna2-cherrypick
DNA2 Cherry-pick (Dev -> Master)
2014-02-12 09:54:13 +00:00
Ccomp5950
942ce6ebc7 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-02-11 18:07:19 -06:00
alex-gh
841333bc30 Fixed halloss not slowing you down 2014-02-11 18:01:37 +01:00
Chinsky
15ca85edf9 Merge pull request #4411 from Ccomp5950/pda-size
NanoUI PDA - Decreasing initial size of the screen.
2014-02-11 17:18:16 +04:00
Ccomp5950
62b70bb827 Bugfix: AI Camera light toggle
Fixes #3676

Before:  Toggling would get stuck where it wouldn't toggle the camera until you reset your view.

After:  Camera light toggles, you have to toggle off before turning on a new camera light though.
2014-02-11 03:20:22 -06:00
Ccomp5950
87cf8bb219 pAI messenger bugfix.
pAI has to be a special little snowflake and have it's own messenger proc instead of letting a AI-PDA handle it.

So, updated it with the newest tnote variable functionality so it can participate.
2014-02-11 01:55:32 -06: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
Ccomp5950
05d4a6da08 Merge pull request #4400 from Loganbacca/re-engineering-merge
Engineering remap
2014-02-11 00:27:37 -06:00
Ccomp5950
caf23de805 DNA2 rangebug, if any hair/beard/eye RGB values are 0 it won't encode it into the dna.
This is a hacky fix and is temporary until I can sit down and figure out exactly why it's not encoding that block of DNA properly.

The result of it not encoding it into the dna is that if you clone the person they have a random value there that was assigned at round start.
2014-02-11 00:14:40 -06:00
Rob Nelson
64f83c51ad And now tested in game, with some fixes. 2014-02-10 22:47:29 -06:00
Rob Nelson
9d33964061 Missed the gene Life() call. 2014-02-10 22:47:08 -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
Rob Nelson
1088888791 DNA2 EPISODE 2: Revenge of the Bugs
Made after DNA2 hit /vg/'s main server after no one tested anything.

* Gene activation/deactivation made modular, refactors domutcheck.
* Standardized genetics disks and injectors a bit in response to buffer corruption issues. (Untested)
* Lots of major bug fixes.
* Skin tones fixed.

Still needs further testing. All I did was mess around with monkeys.

Conflicts:
	code/game/dna/dna2.dm
	code/game/dna/dna2_domutcheck.dm
	code/game/dna/dna2_helpers.dm
	code/game/dna/genes/disabilities.dm
	code/game/dna/genes/powers.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-02-10 22:43:05 -06:00
Ccomp5950
5810970352 Ghosts can see PDA messages. (Redo: PR #4065 lost in merge) 2014-02-10 20:42:32 -06:00
RKF45
054df7a28b Keeping the PDA sane. 2014-02-10 21:14:04 +01:00
Segrain
26f40359fc Fix for unpinning humans. 2014-02-10 01:38:32 +03:00
Segrain
cba6dac062 Fix for unlocking exploit. 2014-02-09 13:34:40 +03:00
Segrain
5bead0c183 Adding blood to humans. 2014-02-09 13:32:42 +03: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
Loganbacca
d50d49cedb Bullet inscriptions
- Can inscribe text into bullets by using a screwdriver on a bullet casing
- Does not work on non-metal type bullets (i.e. rubber bullets, beanbags, stunshots, etc)
- Added weakbullet subtypes "rubber bullet" and "beanbag" with appropriate names
2014-02-09 22:52:27 +13:00
DJSnapshot
cf67b34780 Merge pull request #4401 from Ravensdale/APC
Self-naming APC's! Now even mapped in APC's will rename themselves
2014-02-08 18:18:29 -08:00
DJSnapshot
b47acbbcfb Merge pull request #4396 from RKF45/blob
Readjusts blob random event
2014-02-08 18:17:17 -08:00
Loganbacca
b34ceb5cfd Fixed shrapnel embedding 2014-02-09 14:56:16 +13:00
Ravensdale
677e8a29c8 Tweak APC self-naming so they read better when examined or interacted
with. Thanks Sky for the suggestion and Mloc for the why.
2014-02-08 06:04:33 -08:00
Ravensdale
9d1e160a60 Self-naming APC's! Now even mapped in APC's will rename themselves
depending on what zone they're in. Makes more mapping sanity.
2014-02-07 21:48:37 -08:00
Loganbacca
4b1bb13ace Crate and closet updates
- Added atmos themed sprite for atmospheric technician secure closets
- Added a second radiation suit to radiation suit closets
- Added a solar pack crate (because adding crates to the map with this many objects manually is silly)
2014-02-08 18:35:13 +13:00
Loganbacca
3978492ca4 Removed ID requirement for gas filters
So they can be used in other areas of the station (like toxins and the engine room) without needing atmos access to change settings.
2014-02-08 18:35:01 +13:00
Loganbacca
e26844df12 New areas for engineering remap
- Also moved hallway from Caels Rust areas.dm file to main Space Station 13 areas.dm file
2014-02-08 18:34:32 +13:00
RKF45
5869a3fc38 PDA bombs are now more balanced and random. 2014-02-07 23:28:40 +01:00
RKF45
64dcb5a693 Readjusts blob random event 2014-02-07 19:57:46 +01:00
Rob Nelson
a8d3c0601b And now tested in game, with some fixes. 2014-02-06 23:52:58 -08:00
Rob Nelson
54e4c48f7d Missed the gene Life() call. 2014-02-06 23:19:52 -08:00
Rob Nelson
3121e4fb2d DNA2 Bug Fixes - Part 2
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.
2014-02-06 23:07:35 -08:00
Zuhayr
27dba28a54 Merge pull request #4394 from Baystation12/master
Removes mechs, removes Roboticist, moves exofabs to R&D.
2014-02-07 13:18:37 +10:30
Zuhayr
8a58652c41 Merge pull request #4385 from Loganbacca/pipes-cleanup
Pipe standardization
2014-02-06 13:43:05 +10:30
Zuhayr
353ee43bae Uniform.dmi merge resolution. 2014-02-05 18:35:13 +10:30
Zuhayr
f1b77d0ed6 Master merge. 2014-02-05 18:34:23 +10:30
DJSnapshot
64ff444fa7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into antag
Conflicts:
	icons/mob/uniform.dmi
2014-02-04 23:55:27 -08:00
DJSnapshot
9c803dc1f6 Added the rest of the objectiveless antag types 2014-02-04 23:51:34 -08:00
Ccomp5950
9665e8c4df Mouse Attack_Logs disabled. Admins rejoice.
No more mice in disposals spamming the hell out of admins everytime someone flushes items.
2014-02-05 00:14:45 -06:00
Loganbacca
92cc536133 Pipe standardization
Cleaned up pipes.dm
Changed pipe subtypes to the following layout:
	pipe
		simple/manifold/manifold4w
			hidden
				colour
			visible
				colour

Did a complete pass of the station to standardize all pipes (yes, nearly 2500 changes)
(Haven't done the research base air and scrubber pipes yet, and atmos will be done with my engineering redesign)
2014-02-05 15:16:07 +13:00
DJSnapshot
3026a1306a Merge branch 'master' of https://github.com/Baystation12/Baystation12 into antag 2014-02-04 15:10:13 -08:00
Iamgoofball
2ec805630e Because we HAVE to define Del() three times
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
/obj/item/device/gps/Del()
	GPS_list.Remove(src)
	..()
2014-02-04 11:30:35 -08:00
Chinsky
e7c22c28c7 Merge pull request #4379 from Segrain/master
Smallfix.
2014-02-04 01:44:32 -08:00
Segrain
4b8d5c4f14 Code cleanup. 2014-02-04 08:16:06 +03:00
Chinsky
9a4bcc60b4 Merge pull request #4377 from Ccomp5950/ai_announcements_tease
Commented out the AI Announcement verbs
2014-02-02 23:30:55 -08:00
Segrain
83246df6d5 Fix for #4297. 2014-02-03 07:32:53 +03:00
Segrain
9ff5776c9f Pepperspray safety. 2014-02-03 05:10:04 +03:00