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
Zuhayr
edabf18323
Merge pull request #4012 from N3X15/dna2
...
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08: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
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
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
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
Chinsky
434283d90a
Merge pull request #3990 from Ccomp5950/tatorpanel
...
Bugfix for new traitor panel.
2013-11-29 16:50:41 -08:00
Ccomp5950
675f46fb80
Oops, Typo. What a difference that exclamation point can make.
2013-11-29 15:26:45 -06:00
Ccomp5950
05492cc921
Created a check to see if there is a registered user of the syndicate card,
...
if there isn't it assignes the first person who tries to change their name with it as the registered user.
2013-11-29 15:07:39 -06:00
Zuhayr
367cc3a827
Added skeleton code for mob abilities.
2013-11-30 00:02:05 +10:30
Chinsky
ca649d95aa
Fixed issue with chopped off heads not having hair icons.
...
Also threw in some eyecandy, limbs now turn at random angle (70 - 130) instead of straight 90.
2013-11-29 16:13:45 +04:00
Zuhayr
d80edab619
Merge resolution. God damn the changelog.
2013-11-29 22:39:33 +10:30
Zuhayr
794ca4064e
Merge resolution.
2013-11-29 22:36:36 +10:30
Zuhayr
9c4b4c2817
Merge resolution.
2013-11-29 22:34:09 +10:30
Mloc
f1672e2de0
Merge pull request #3987 from MrLeebo/dev
...
Thanksgiving Update: Tofurkey!
2013-11-29 03:10:10 -08:00
Ccomp5950
3be474bab8
Admin request: Added ability to jobban players from becoming Dionaea nymph
2013-11-28 22:35:12 -06:00
