Commit Graph

11349 Commits

Author SHA1 Message Date
Zuhayr
78e09f33d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-05 21:32:23 +10:30
Zuhayr
78f6c478e7 Merge pull request #4031 from Ccomp5950/investigate_fix
Added Telesci to the investigate list.
2013-12-05 03:00:33 -08:00
Zuhayr
b3c0079e18 Merge pull request #4004 from volas/master
Minor fixes
2013-12-05 02:56:06 -08:00
Chinsky
bd806e7830 Merge pull request #4019 from Ccomp5950/internals_hud_fix
Bugfix:  Internals HUD click action.
2013-12-05 02:54:28 -08:00
Zuhayr
a74ffa0136 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-05 21:15:09 +10:30
Zuhayr
28253c2b3a I hate the changelog. 2013-12-05 21:14:56 +10:30
Ccomp5950
dd94adc765 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into investigate_fix 2013-12-05 04:42:28 -06:00
Zuhayr
edabf18323 Merge pull request #4012 from N3X15/dna2
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08:00
Ccomp5950
157b67404c Added Telesci to the investigate list.
Admins will now be able to select it and view who used the telescience machines
2013-12-05 04:21:18 -06:00
Chinsky
9938c152ff Merge pull request #4023 from Zuhayr/feature
Ability skeleton code, basic cryopod functionality.
2013-12-04 13:50:17 -08:00
DJSnapshot
ad4782babe Merge pull request #4025 from nightexcessive/bugfix/ai-apc
Fixes #2355
2013-12-03 21:46:23 -08:00
Ccomp5950
52d328623a Tanks will also keep up with who manipulated them last.
Tanks placed in canisters, scanned with PDA or other analysis tool will set the manipulated_by variable to whoever did so.

The idea is that this person is aware what's in the tank and will act accordingly when you press the internals HUD icon.

If the user was the last person to manipulate the tank (or it's not been manipulated) then the user is smart about selecting the proper tank.

If the user was not the last person to manipulate the tank then he is only checking the pressure gauge to see what tank is fullest that matches his species breath_type

If that tank has nasties in it, welp he is going to get a breathful of nasties.
2013-12-03 23:01:42 -06:00
Kilakk
d2c07184f7 Merge remote-tracking branch 'upstream/dev' into dev-radio
Conflicts:
	maps/tgstation2.dmm
2013-12-03 21:24:03 -05:00
Zuhayr
46379c5a16 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze 2013-12-04 12:36:05 +10:30
Zuhayr
5c1415f3b8 Removed some commented ability code. 2013-12-04 12:30:37 +10:30
Ccomp5950
94f8ccfddd Bugfix: AI no longer dies if touching the supermatter, using attack_ai instead of a isAI() check. 2013-12-03 18:50:19 -06:00
Ccomp5950
254bba5e1a Bugfix: AI's will no longer disintegrate if they click the supermatter.
While hilarious this is a terrible bug.
2013-12-03 17:24:29 -06:00
Michael Johnson
65d62026b0 Fixes #2355 2013-12-03 13:53:52 -05:00
Chinsky
bcd15162be Merge pull request #4024 from comma/dev
Master -> Dev
2013-12-03 07:43:11 -08:00
Chinsky
0074452f29 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2013-12-03 19:42:17 +04:00
Zuhayr
74fe8cd76a Somehow managed to break this during merge resolution. 2013-12-03 22:42:22 +10:30
Zuhayr
0a0a71a66c Added cryo log, item recover strings and various bits and bobs to cryopods. Restored 9000 tick delay on use. 2013-12-03 22:31:22 +10:30
Zuhayr
b35e8cd8fb Added cryopod console with item recovery. 2013-12-03 22:05:35 +10:30
Zuhayr
411308b287 Added item preservation, cryo announcements and a minimum timer to cryopods. 2013-12-03 21:28:30 +10:30
Ccomp5950
af11500762 Bugfix: Internals HUD click action.
Before:  If you had a tank on your back full of nice precious oxygen, and a tank of plasma in your hand and thought "I'll play it safe and turn on internals" and click the internals icon you would start sucking down plasma like you weren't really qualified to handle such things, how do you even get those two mixed up you big dummy!  Code was hardcoded junk.

After:  A check of what your species prefers to breath, you are an adult, I'm pretty sure you can remember if the tank on your back is oxygen or not, and you will turn on the fullest tank.
Code is now nolonger hardcoded junk, and is expandable by editing a couple of variables instead of hardcoding everything.  Double Rainbow, All The Way Across The Sky!

Also coded in a check for "Carbon Dioxide" in the event a downstream server uses a race that breathes that or we move dionaea to breathing it in the future.
2013-12-03 00:06:08 -06:00
Zuhayr
7effb3a909 Basic functionality for crypod despawners. 2013-12-03 04:21:37 +10:30
Zuhayr
5e3857ff38 Compile fix for global ability list. 2013-12-03 03:36:10 +10:30
Zuhayr
69d84931e6 Changelog merge resolution. 2013-12-03 01:07:17 +10:30
Ccomp5950
624068cc4f Emergency Insertion - Supermatter Manual.
/obj/item/weapon/book/manual/supermatter_engine
2013-12-01 19:31:25 -06:00
Kilakk
13abdf9fdc Moved the CentComm channels onto their own tcomm network thing
* 144.1 and 144.3 are accessible through regular headsets, silly people were using them to listen in on response teams
* Moved the ERT and Deathsquid channels to 134.5 and 134.1 respectively
* Created presets for a tcomms setup on the CentComm zlevel
2013-12-01 18:58:16 -05:00
Kilakk
f6fff10908 Added burning paper with lighters
* why not?
* Now with 150% more noir
2013-12-01 17:26:33 -05:00
Mloc
fc9dc8243e Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 2013-12-01 21:42:23 +00:00
Rob Nelson
53c2aff420 DNA2 - A recode of DNA
DNA now stores blocks internally as numbers and only makes the uni_identity and struc_enzymes strings when something has changed. This is vastly more efficient.

In addition, the API for using it has been simplified. Common tasks, such as setting a sub-block, or getting a value from the block, are handled entirely by the DNA datum with simple, easy-to-use procs.

Tested on local server, but may need balancing and additional look-over since the code is from our server (/vg/) and I likely broke or forgot something.
2013-12-01 00:04:27 -08:00
Zuhayr
e90fd95a22 Merge resolution. 2013-12-01 15:19:29 +10:30
Zuhayr
4ea738c8b5 Merge pull request #3996 from comma/dev
Fixed issue with chopped off heads not having hair icons.
2013-11-30 20:46:04 -08:00
Zuhayr
19c41e3d75 Commenting out test ability stuff. 2013-12-01 15:12:11 +10:30
Mloc
b682e9ace0 Merge pull request #3998 from DJSnapshot/hotfix
bugfixes!
2013-11-30 15:26:14 -08:00
DJSnapshot
2203309fcc Merge pull request #4006 from Baystation12/master
merge master into dev-freeze
2013-11-30 15:22:31 -08:00
volas
e33490d80a Fixes: AI won't steal fax, and mice won't flip tables anymore. 2013-11-30 23:54:06 +04:00
volas
e05b7f4341 brainmob fix: decapitated head is now really dead 2013-11-30 15:45:53 +04:00
Ccomp5950
0040a91b23 Ghost MedicHUD now actually checks for viruses.
Thanks Chinsky for the tip!
2013-11-30 01:56:13 -06:00
Chinsky
9437241425 Merge pull request #3995 from Ccomp5950/dionaea_jobban
Admin request:  Added ability to jobban players from becoming Dionaea nymphs
2013-11-29 23:00:26 -08:00
Ccomp5950
d039bea124 Ghostbuff, round 2. MedicalHUD
Ghosts can now toggle a medical HUD
2013-11-30 00:00:56 -06:00
DJSnapshot
00ecbcdcfd fix for https://github.com/Baystation12/Baystation12/issues/3887
Thanks to AquaDraco for the fix
2013-11-29 17:44:31 -08:00
Chinsky
e698c842a7 Merge pull request #3994 from Ccomp5950/exosuit_handcuffs
Players will now no longer be able to jump in exosuits while handcuffed.
2013-11-29 17:33:00 -08:00
Chinsky
027b0d8ec6 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:16:49 +04:00
Chinsky
5b168c8e4b Merge branch 'dev-freeze' into dev
Conflicts:
	icons/obj/ammo.dmi
2013-11-30 05:15:22 +04:00
Chinsky
3e52d581a7 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2013-11-30 05:12:06 +04:00
Chinsky
5d3e712d64 Merge branch 'master' into dev-freeze
Conflicts:
	html/changelog.html
2013-11-30 05:11:36 +04:00
Chinsky
b4baf60414 Merge pull request #3989 from Ccomp5950/syndicate_id_fix
Hotfix for Syndicate ID's not being able to be assigned names / job
2013-11-29 17:05:16 -08:00