mwerezak
53855d2398
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge
2015-05-18 18:47:45 -04:00
Chinsky
8e5f5ef8e0
Merge pull request #9165 from Yoshax/trapping
...
Makes bear traps do damage when stepped on
2015-05-19 01:43:05 +03:00
Atlantis
4cd2417eb8
Implements suggestions from github
...
- qdel() instead of del()
- z in config.station_levels insted of z == 1
- Typo fix
- Playercount is now 2 instead of 1 which was debug setting
- AI is now properly deleted when struck by very strong explosion (heavy impact).
- Hardware now properly uses install(). Hardware list is generated from existing datums using typesof()
2015-05-18 22:05:18 +02:00
PsiOmegaDelta
ce8188c1a2
Merge pull request #9350 from Hubblenaut/lockers
...
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
PsiOmega
c26b4e79b9
Fixes #9244 .
...
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +02:00
Hubblenaut
ac1f3c3530
Fixes overbloated closets
2015-05-18 18:34:25 +02:00
PsiOmega
e2e0ffc6e5
Compilation fixes.
2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
PsiOmegaDelta
a7d72940cf
Merge pull request #9348 from Baystation12/master
...
Dev-freeze
2015-05-18 17:48:36 +02:00
Chinsky
33e8791fe9
Merge pull request #9264 from Hubblenaut/airlocks
...
Fixes airlock wires
2015-05-18 18:21:05 +03:00
Chinsky
6169c49832
Merge pull request #9143 from Loganbacca/qol_mule
...
[QOL] MULE destination selection
2015-05-18 18:20:17 +03:00
Chinsky
6a14d39209
Merge pull request #9345 from Zuhayr/master
...
Set vine mouse opacity to 2.
2015-05-18 18:19:45 +03:00
Hubblenaut
86426d0424
Fixes airlock wires and adds backup power light
2015-05-18 16:55:12 +02:00
Zuhayr
f72203c611
Set vine mouse opacity to 2.
2015-05-18 22:07:00 +09:30
Daranz
e13bc6ab54
Add access_medical_equip to get_all_accesses()
2015-05-18 08:33:51 -04:00
Kelenius
cd9aa7c9af
Fixes mankini typo
2015-05-18 12:34:03 +03:00
Chinsky
a3a2c615de
Merge pull request #9300 from PsiOmegaDelta/RoundStart
...
Gamestart cleanup.
2015-05-18 12:00:49 +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
PsiOmegaDelta
2ff11b4390
Merge pull request #9340 from GinjaNinja32/table_reinf_icon
...
New reinforced table overlays that better match the old sprites.
2015-05-18 08:24:36 +02:00
GinjaNinja32
cda71446eb
Fixes #9341
2015-05-18 07:10:37 +01:00
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
