Commit Graph

17861 Commits

Author SHA1 Message Date
Chinsky
ecc2b3c437 Merge pull request #9258 from mwerezak/charge
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Yoshax
7cfb921ca0 Fixes a typo/mistake 2015-05-20 20:36:24 +01:00
Chinsky
8871696c52 Merge pull request #9353 from Ccomp5950/goat_simulator3000
Goat Buffs.
2015-05-19 17:56:55 +03:00
mwerezak
e23f5e7e06 Fixes hardsuit shocking 2015-05-18 20:09:31 -04:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Chinsky
6a14d39209 Merge pull request #9345 from Zuhayr/master
Set vine mouse opacity to 2.
2015-05-18 18:19:45 +03:00
Zuhayr
f72203c611 Set vine mouse opacity to 2. 2015-05-18 22:07:00 +09:30
Kelenius
cd9aa7c9af Fixes mankini typo 2015-05-18 12:34:03 +03:00
ccomp5950
53e52a6f92 Goat Buffs.
Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
2015-05-18 04:35:19 -04:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Chinsky
1f76ae4250 Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
PsiOmega
21dad8bdc0 Teleport anomaly fix.
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
2015-05-16 14:46:57 +02:00
Chinsky
2359245f06 Merge pull request #9285 from mwerezak/master-fixes
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
GinjaNinja32
137c77c19d Typo fix 2015-05-16 10:48:59 +01:00
PsiOmegaDelta
05033b5762 Merge pull request #9278 from Ccomp5950/ravensrequest
Admin log fix:  Something that really annoys ravensdale.
2015-05-16 09:29:15 +02:00
PsiOmegaDelta
07cb2aa1ad Merge pull request #9291 from Techhead0/seeTheInvisible
Invisible people can now be heard by visible_message
2015-05-16 08:57:21 +02:00
mwerezak
d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak
5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak
3e41d6ff6e Fixes crossbow icon issue
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
2015-05-15 23:06:29 -04:00
mwerezak
65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak
29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Techhead0
35e44ab8d9 Invisible people can now be heard by visible_message
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
2015-05-15 21:06:16 -04:00
ccomp5950
19cc6df391 Conversion to admin_attack_log() 2015-05-15 17:07:07 -04:00
Techhead0
ec37652997 Fixes #7999 2015-05-15 13:34:46 -04:00
ccomp5950
735202d409 Admin log fix: Something that really annoys ravensdale.
<Ravensdale1> [X] has shot [y] with a the bullet

http://i.imgur.com/F54KjJ3.png
2015-05-14 21:07:36 -04:00
mwerezak
aeb1f5ae68 Updates instances of if(cell.use(...)) 2015-05-14 01:52:04 -04:00
Chinsky
713deb4137 Merge pull request #9253 from PsiOmegaDelta/StealthFixes
Adjusts rig stealth module costs.
2015-05-14 04:17:56 +03:00
Chinsky
dd008c7790 Merge pull request #9254 from PsiOmegaDelta/CellDepletion
Using more energy than a cell has stored now drains the cell.
2015-05-14 04:17:43 +03:00
PsiOmega
3d1b671703 Asking for more energy than a cell has stored now drains the cell.
Fixes #9252.
2015-05-13 23:38:49 +02:00
PsiOmega
91f67e5dc5 Adjusts rig stealth module costs.
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
2015-05-13 22:38:52 +02:00
Daranz
b95692e484 Fix a problem in human/has_eyes() 2015-05-13 13:58:37 -04:00
GinjaNinja32
c952507f3c Fixes carp attacking mechs over z-levels
Fixes #9198.
2015-05-12 15:53:28 +01:00
Chinsky
009dc181b2 Merge pull request #9203 from mwerezak/vines2
Updates weed control crate
2015-05-12 15:58:47 +03:00
PsiOmegaDelta
d12d1b93d1 Merge pull request #9204 from Ccomp5950/mangled_request
Holodeck items no longer spam admin attack logs.
2015-05-12 11:22:02 +02:00
PsiOmegaDelta
b30465374d Merge pull request #9201 from GinjaNinja32/vine
Fixes vines not being vines.
2015-05-12 07:04:41 +02:00
ccomp5950
569e785014 Holodeck items no longer spam admin attack logs.
/obj/items now has no_attack_log variable if set to 1, it won't log.

All holodeck items and lasertag weapons have no_attack_log set.

<3 Mangled
2015-05-11 22:11:46 -04:00
Zuhayr
abc75718b7 Merge pull request #9179 from PsiOmegaDelta/LevelSevenBioHazard
Adds announcement to the space vine event
2015-05-12 11:29:24 +09:30
mwerezak
56c610e111 Updates weed control crate
Removes the scythe from the weed control crate and replaces it with hatchets and plantkiller spray bottles.
2015-05-11 21:20:16 -04:00
GinjaNinja32
3fc9d89163 Fixes vines not being vines. 2015-05-12 01:56:51 +01:00
PsiOmega
d1eae14343 Fixes #9183
Very critical. No lewdness allowed.
2015-05-11 09:08:27 +02:00
Chinsky
287a3805fd Merge pull request #9184 from mwerezak/vines2
Tweaks space vines
2015-05-11 09:16:03 +03:00
mwerezak
d39fc76113 Tweaks space vines
Vines no longer mature nearly immediately, entangle less frequently.
Fixes vines entangling from adjacent turfs, which made it hard to tell
which vine was entangling someone.
2015-05-10 23:23:25 -04:00
Zuhayr
55b3b9d151 Merge pull request #9174 from PsiOmegaDelta/ImplantLogs
Corrects implanter attack log.
2015-05-11 11:44:25 +09:30
PsiOmega
144b11ed14 Adds announcement to the space vine event. 2015-05-10 20:40:49 +02:00
PsiOmega
9d883ea914 Corrects implanter attack log.
The contents of the implant was reported in the attacker/victim log but not the admin log.
2015-05-10 15:11:37 +02:00
Ccomp5950
929e64311e Merge pull request #9133 from PsiOmegaDelta/AntagHUDRestrictions
Enforces antagHUD restrictions.
2015-05-10 06:03:36 -04:00
Zuhayr
a64f91994b Merge pull request #9151 from Yoshax/nomorechems
Removes sleepy chems from cloning
2015-05-10 15:37:21 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile
Made sterile gloves actually start sterile
2015-05-10 15:11:29 +09:30
Chinsky
6618b225a0 Made sterile gloves actually start sterile
Fixes #9163
2015-05-09 22:10:39 +03:00