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
Nanai
a8f1ee6c91
Girder health/laserkill fix
...
Allows girders to be broken by repeated laser shots to stop abuse against laserfire. Also, for actually being able to lase through walls if they're open.
Resolves issue #3796
2013-11-23 18:50:15 -05:00
Zuhayr
185c83b287
Fixes #3642
2013-11-24 09:22:50 +10:30
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
Ccomp5950
bcbf02e809
Changed admin message to use the proc that formats for easy Admin-PM of the baddie.
...
Thanks Kilakk for pointing it out.
2013-11-22 18:36:20 -06:00
Ccomp5950
3ae79d1e91
Admin request: Added admin logging to Detomatix cartridge explosions instead of just admin_messages.
2013-11-21 18:37:23 -06:00
Ccomp5950
7d545437a3
Spelling mistake.
...
Commit_Count++
2013-11-20 17:49:11 -06:00
Ccomp5950
d1ca50f384
Bugfix: Yeah variables are case sensitive.
...
Lesson learned: Always compile before commit, unless attempting to pad your commit count.
2013-11-20 17:24:39 -06:00
Ccomp5950
34fb26a649
Ravensdale request:
...
Detomax cartridge use will not create an admin message saying the name/key of the antag that tried to blow up the target, and if it was successful or not.
2013-11-20 17:11:21 -06:00
Chinsky
8696d4fbd9
No nullname ID cards
2013-11-12 02:10:01 +03:00
DJSnapshot
7665a1a00e
Merge pull request #3895 from Baystation12/master
...
Merge Dev with Master
2013-11-07 16:31:43 -08:00
Chinsky
b7edb181ed
Where can I get my idiot certificate.
2013-11-05 03:59:39 +04: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
Chinsky
98ba7e4699
Fixes zombie goast tableflips
2013-11-04 22:36:22 +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
Iamgoofball
989c8b69c5
Fixed Copypasta again!
...
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
Fixed Copypasta again!
2013-11-02 11:36:14 -07:00
Iamgoofball
74b5a003cc
Fixed Copypasta!
...
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball
a75492d26b
Startoad's plasma windows commit, I'm doing the github stuff for it.
...
https://github.com/StarToad/Baystation12/commit/3677121b51af852ed951c214c57a08fab60222c1
2013-11-01 18:53:45 -07:00
Cael Aislinn
a4e5bad409
fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-10-29 05:10:17 +10:00
Nanai
adc563db05
Added in two new manuals by Magmaram for atmospherics and EVA.
2013-10-27 18:24:30 -04:00
Nanai
88ef9a3be2
Fixed the absent/removed sprite on experimental welding tools.
2013-10-27 18:24:04 -04:00
Segrain
858df5ca64
Fix for #3804 .
2013-10-24 19:16:54 +03:00
Segrain
6655ae9b11
Wallets and cards.
2013-10-21 05:10:33 +03:00
Segrain
8bd055357a
Same fix again.
2013-10-21 04:48:07 +03:00
Segrain
121b10b16c
Conflict fix.
2013-10-21 04:37:28 +03:00
Segrain
ace205b323
Code cleanup.
2013-10-18 08:40:45 +03:00
Segrain
183c44c4c8
Smallfix.
2013-10-18 08:38:14 +03:00
Chinsky
930a30cfd0
Moved stuff from /structure to /obj/structure because I am tired of accidently going inside of it for unused file and empty file
2013-10-16 12:51:30 +04:00
Chinsky
55ea60a785
Fixed derpy type of psych couch
2013-10-16 12:50:40 +04:00
Chinsky
f3028d3edd
Attempted fix #3769
...
Var is fine in one line, null in next one. Cannot feasibly prevent that without slapping nullcheck before EVERY mention on that var, so going to just add some sanity checks and call it a day
2013-10-16 11:28:41 +04:00
Segrain
21718c5bac
Fix for #3764 .
2013-10-13 03:44:43 +03:00
Mloc
1b9e5c81ea
Merge pull request #3756 from comma/tableflip
...
Tableflips & cover system
2013-10-11 11:36:31 -07:00
Chinsky
05bb07375e
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into coathanger
2013-10-11 22:22:08 +04:00
Chinsky
a18fbaac1d
Cover system.
...
Tables now give some cover from bullets and beams.
Standing behind the table gives you 20% chance of table taking the hit instead.
Flipped table gives +20%, but only if bullet comes from the side it faces. Otherwise no cover is provided at all.
Lying on the floor gives +20%.
Table takes half of damage human would, and breaks down after its health goes to zero.
Reinforced talbes have double the health, wooden ones - half.
2013-10-11 22:17:45 +04:00
Segrain
eb9a337d07
Merge remote-tracking branch 'upstream/master' into dev
2013-10-11 12:44:44 +03:00
Segrain
7ea98f6d79
Examining fix.
2013-10-11 10:19:58 +03:00
Chinsky
fadc121dac
Can flip weakened reinforced table now too.
2013-10-11 10:52:24 +04:00
Chinsky
c30693dfcf
Flipped tables now have 20% chance to take damage instead of whatever is behind them.
2013-10-11 02:48:41 +04:00
Chinsky
daba423428
Tableflips!
...
You can now flip non-reinforced straight, 1-tile wide tables.
Complete with ugly codersprites for flipped tables.
2013-10-11 02:13:59 +04:00
Chinsky