Commit Graph

19125 Commits

Author SHA1 Message Date
Chinsky
814d38ce66 Adds more info to self-examine 2015-05-18 08:25:34 +03:00
Chinsky
c62958fc89 Fixes #9336 2015-05-18 07:58:41 +03:00
Chinsky
ef0f21bd1a Ghetto MD part 2
Examining people with grab-exmaine move now can tell you if they have toxins in blood, or are short of breath.
Stethoscopes now actually give real info about severe oxyloss/internal organs damage.
2015-05-18 07:45:29 +03:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Chinsky
26e5630e23 Ghetto diagnostics!
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
Chinsky
f016d51f38 Fixes cavity surgery using old organ names 2015-05-18 06:15:09 +03:00
Chinsky
57a7c307b9 Fixes dislocation not being set properly on an actual targeted limb.
Fixes being unable to pop back joints of other people. (it was making victim pick the limb)
2015-05-18 03:50:47 +03:00
Chinsky
b08fcb8d3e Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking
Destroying a camera now also cuts wires randomly.
2015-05-18 00:40:56 +03:00
Chinsky
d374cd2681 Merge pull request #9292 from mwerezak/vital-areas
Allows damage to accumulate past max_damage on vital organs
2015-05-18 00:38:16 +03:00
Chinsky
8f50faf93c Merge pull request #9322 from Kelenius/ofVotesAndLinks
Adds a voting link to the vote notification
2015-05-17 23:44:52 +03:00
Mustafa Kalash
a5aede3b70 Gives IA agents bridge access and the HoS' encryption key. Changes IA agents' supervisor to Nanotrasen officials and regulations. 2015-05-17 12:43:20 -04:00
Zuhayr
59bfc08853 Merge pull request #9317 from Dennok/patch-1
Fix connector updates
2015-05-18 00:21:47 +09:30
Zuhayr
8917a03380 Merge pull request #9296 from PsiOmegaDelta/TurfProcessing
Turf processing
2015-05-17 22:51:45 +09:30
Zuhayr
4ea779ae6c Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
Cleans up welder code.
2015-05-17 20:21:31 +09:30
Kelenius
5fac67ea4e Adds a voting link to the vote notification 2015-05-17 13:33:49 +03:00
Github is ok, I guess
77206c6f5f Update gameticker.dm 2015-05-17 10:36:59 +01:00
Github is ok, I guess
229087c269 Update statistics.dm 2015-05-17 10:36:20 +01:00
PsiOmega
c16d033b18 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-17 11:30:04 +02:00
PsiOmegaDelta
b423ba7bc4 Merge pull request #9319 from Baystation12/master
Dev-freeze
2015-05-17 11:29:39 +02:00
Zuhayr
8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
PsiOmega
2c60619273 Restores the original messages. 2015-05-17 10:25:37 +02:00
Dennok
bd3d26f5bf Fix connector updates 2015-05-17 10:26:59 +03:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Chinsky
1f76ae4250 Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
Zuhayr
a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
Zuhayr
4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Atlantiscze
71bfe729fa Compile Fix
- Fixes mistake in previous commit.
2015-05-17 02:59:59 +02:00
Atlantiscze
bcfbfdedba CPU Generation adjustment
- Doubles CPU generation from APCs. Testing revealed that current values are simply too small.
- Decreases DualCPU hardware boost to +50% CPU generated (instead of +100%)
- Minor code clean-up at hardware selection screen.
2015-05-17 02:54:58 +02:00
PsiOmega
8b39f9201a Compilation fixes. 2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/projectiles/guns/launcher/crossbow.dm
	code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
PsiOmegaDelta
4db25c61d2 Merge pull request #9313 from Baystation12/master
Dev-freeze
2015-05-16 22:36:03 +02:00
Zuhayr
14df1e5fb5 Converts beds, chairs and stools. 2015-05-17 03:43:59 +09:30
Zuhayr
dbe8221c60 Merge pull request #9308 from Karolis2011/dev
Made sorting and tagger pipes dispensible
2015-05-17 03:23:10 +09:30
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
mwerezak
9ae57e95e1 Moves mob animations to a new source file, adds attack animation 2015-05-16 12:44:49 -04:00
Zuhayr
8f6666a32e Converted barricades to material system. 2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
PsiOmegaDelta
d4c205e12a Merge pull request #9200 from mwerezak/tail-swish
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
Karolis2011
645ad1a177 Made tagger pipe dispensible. 2015-05-16 18:05:47 +03:00
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30
Karolis2011
0999f1ab78 Made sorting pipes dispesible
also fixes #9305
2015-05-16 17:27:39 +03:00
Zuhayr
83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30
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
PsiOmega
aad28d63ce Cleans up welder code.
Icon and inhand states should now update properly.
2015-05-16 14:13:24 +02:00
Zuhayr
150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
PsiOmegaDelta
65151ade35 Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate
Inflatables now lose deflate verb when it's used
2015-05-16 13:51:16 +02:00
PsiOmegaDelta
98fce1fa1e Merge pull request #9301 from Kelenius/ofChemAndRuntime
Fixes #9294
2015-05-16 13:47:05 +02:00
Zuhayr
f4923e2a20 Renamed twohanded weapons, collapsed bats. 2015-05-16 21:12:54 +09:30