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
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
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
SkyMarshal
d43b2fa492
RCDs no longer create plating with air on it.
...
Fixes #3545
2014-01-08 17:50:59 -07: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
DJSnapshot
b294174acb
Openable soda cans and beer bottles!
2013-12-31 17:52:12 -08:00
Chinsky
d166d3c992
Merge pull request #4100 from Zuhayr/dev
...
DNA2 EPISODE 2: Revenge of the Bugs
2013-12-25 03:49:58 -08:00
Zuhayr
ff52920fab
DNA2 fixes cherrypicked from N3X15.
2013-12-23 00:06:56 +10:30
Zuhayr
197d4993cf
Merge pull request #4087 from comma/nostalgy
...
Revisiting my first commits.
2013-12-22 05:28:35 -08:00
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
Zuhayr
11f8a5835f
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-19 00:01:12 +10:30
Chinsky
65fa11d496
Revisiting my first commits.
...
Updated ashtray to actually accept cig butts and crush lit cigs properly.
Applied random transform to cig butts, and made fingerprints from original cig carry over.
2013-12-18 12:02:20 +04:00
Zuhayr
8d76690f44
Fixes #4042
2013-12-18 10:30:59 +10:30
Mloc-Argent
b175c6906b
Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
html/changelog.html
2013-12-13 19:13:43 +00:00
Ccomp5950
fea1819260
Runtime fix: It was a bad idea to have this stuff in New()
...
So now it gives a default values and moves on.
2013-12-07 05:17:04 -06:00
Zuhayr
17380e308e
Extra check in secure case interaction for aliens.
2013-12-05 22:04:11 +10:30
Zuhayr
a110cfaed7
Fixes #4030
2013-12-05 21:58:33 +10:30
Zuhayr
edabf18323
Merge pull request #4012 from N3X15/dna2
...
DNA2 - A recode of DNA
2013-12-05 02:39:55 -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
Chinsky
0074452f29
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-03 19:42:17 +04:00
Ccomp5950
624068cc4f
Emergency Insertion - Supermatter Manual.
...
/obj/item/weapon/book/manual/supermatter_engine
2013-12-01 19:31:25 -06: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
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
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
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
Ccomp5950
287860b377
Force name update on new() of syndicate ID cards
...
Will make sure there is no null names making players unclickable as well as making syndicate cards work
2013-11-28 20:52:38 -06:00
Ccomp5950
497c111796
Bugfix: Hyposprays now fit in medical belts.
...
Problem: Person fixing bug #2006 was a bit too specific about type of autoinjectors able to fit in belt.
Solution: Be less specific. Now hyposprays fit in belts.
2013-11-28 19:25:43 -06:00
Ccomp5950
1f76f4cfd0
Hotfix for Syndicate ID's not being able to be assigned names / occupations.
2013-11-28 18:43:46 -06:00
Mloc
503302dae5
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/reagents/Chemistry-Machinery.dm
2013-11-24 23:37:09 +00:00
Jeremy Liberman
7e22046b1e
Add Cash Bag. Works like Plant Bag but for cash/coins
2013-11-23 17:22:01 -06:00
Nanai
5484163efe
Implant mode changability, explosive variable fix
...
Fixed and upgraded as per Ravensdale's request in #3966
2013-11-23 06:55:12 -05:00
Zuhayr
bfc5a61da1
Fixes #3966
2013-11-23 20:33:58 +10:30
Chinsky
c50c401a85
Walking on tile makes it dirty. Takes 40 times for mob to enter tile for dirt overlay to appear.
...
Mopping resets dirtiness level.
2013-11-21 13:46:16 +04:00
Iamgoofball
06719b5aa9
added a fuck ton of small changes
2013-11-19 23:00:07 -08:00
Nanai
7ce2314c11
Merge Fixes
...
Fixes issues post merge and and with minor sanity checks and neatness.
2013-11-14 13:08:40 -05:00
Nanai
cba1a9585d
Medical Hoopery
...
Added eyes as an internal organ, removed the eye-stat var on mobs and changed it to properly direct it to eye damage. Altered all reference.
Updated the sleeper to allow for ejection of the beakers and occupants in panel.
Updated the body scanner to check for prosthetics/mechanized organs, and inform the individual of the blind disability.
Laid the groundwork for mechanical and assisted internal organs.
Groundwork for chemical: Peridaxon, a chemical that allows for the slow regeneration from organ damage.
2013-11-14 12:40:30 -05:00
Mloc-Argent
e6b44d0f35
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2013-11-14 12:03:59 +00:00
Chinsky
8696d4fbd9
No nullname ID cards
2013-11-12 02:10:01 +03:00
Chinsky
65c248cda0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into miasma
2013-11-05 02:57:40 +04:00
Chinsky
fd928d4b5f
Cleaned the fuck out of smoke.
2013-11-05 02:57:23 +04:00
Mloc-Argent
f1b230edc4
Merge branch 'master' into dev
2013-11-04 10:46:13 +00:00
DJSnapshot
63fb3f29ea
mecha fixes
2013-11-02 12:26:34 -07:00
DJSnapshot
69389d392c
Fix for https://github.com/Baystation12/Baystation12/issues/3813
2013-11-02 11:45:26 -07:00
Nanai
adc563db05
Added in two new manuals by Magmaram for atmospherics and EVA.
2013-10-27 18:24:30 -04:00
