GinjaNinja32
c1cc002109
Merge pull request #9601 from Techhead0/survivalBox
...
Survival box and job spawning fixes.
2015-05-31 19:47:44 +01:00
Techhead0
9047bbe2a2
Removes O2 tank and spare mask from Vox boxes.
2015-05-31 14:17:24 -04:00
Chinsky
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
Zuhayr
201712eb3d
Added MATERIAL_PADDING flag.
2015-05-31 17:19:32 +09:30
Zuhayr
fd2855800f
Merge pull request #9582 from mwerezak/robolimbs
...
limb fixes
2015-05-31 17:14:25 +09:30
mwerezak
d541fda7be
Sets w_class for external organs
...
Adjusts the edge w_class requirement to require a weapon that is larger
than or equal to the limb's w_class. Also makes the surgical saw and
surgical drill w_class = 3, and the scalpel w_class = 1.
2015-05-30 19:02:37 -04:00
Zuhayr
ae38961a65
Fixes #9551
2015-05-31 03:36:07 +09:30
Zuhayr
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
PsiOmegaDelta
12d1277925
Merge pull request #9577 from Zuhayr/dev-freeze
...
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr
eaf7e6718d
Merge pull request #9553 from GinjaNinja32/reagent_protection
...
Fixes #5945 , de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr
deb806c4cb
Fixes #9076
2015-05-30 05:24:44 +09:30
Zuhayr
a3f3009eb4
Fixes #9063
2015-05-30 05:16:01 +09:30
Zuhayr
c5df326533
Fixes #9414
2015-05-30 03:15:19 +09:30
GinjaNinja32
cf722a2d34
Closes some span tags
2015-05-29 18:01:50 +01:00
Zuhayr
fa7c43bf39
Merge pull request #9549 from atlantiscze/bright-solution
...
Refactor floodlights
2015-05-30 02:11:10 +09:30
Zuhayr
3cf0018fb8
Fixing up bed icons etc.
2015-05-30 01:13:11 +09:30
Zuhayr
93aaa48cd8
Fixes #9571 , various other tweaks.
2015-05-30 00:59:39 +09:30
Zuhayr
7d7723c19d
Further material tweaks.
2015-05-30 00:45:58 +09:30
Zuhayr
e9f2f5cf55
Converted comfy chairs to material system, cleaned up colours/icons.
2015-05-30 00:45:36 +09:30
GinjaNinja32
86f52910a1
Fixes #5945 , de-copy-pastes parapens and sleepypens
...
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Atlantis
30e4550e2e
Refactor floodlights
...
- Fixes #9543
- Removes ugly floodlight/proc/updateicon() and replaces it with proper floodlight/update_icon() which is standard on all objects/items. Does the same refactor for power cells and adjusts the proc call in relevant files (hence the amount of 1-line changes in various files)
- Makes floodlights properly use CELLRATE. Their load is 200 watts. Cell adjusted accordingly, it starts with 1k cell, which is enough for ~40 minutes (roughly)
- Floodlights with almost discharged cell (less than 10%) ocassionally "flicker", dimming for few seconds. This serves as indicator that the power cell is running low.
- Floodlight luminosity adjusted. They now shine slightly more, espicially closer to the floodlight.
2015-05-28 21:45:54 +02:00
Atlantis
7981777c41
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-28 20:16:12 +02:00
Chinsky
3d5b7e5744
Merge pull request #9464 from Kelenius/ofChemAndAnalyze
...
Medical scanners now scan ingested reagents
2015-05-27 06:32:20 +03:00
Kelenius
359e055463
Lets medical scanners scan stomach
2015-05-25 19:11:14 +03:00
mwerezak
c08774d96e
Updates bear traps
...
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.
Conflicts:
baystation12.dme
2015-05-24 16:33:41 -04:00
Atlantis
1da44dc861
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
...
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
2015-05-24 20:23:46 +02:00
Chinsky
b01c3a4ba9
Merge pull request #9451 from PsiOmegaDelta/Tmp
...
Fixes #9447 .
2015-05-24 18:16:08 +03:00
PsiOmega
c21a456379
Fixes #9447 .
...
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
PsiOmega
5ee1e3df56
Fixes #9443 .
...
Restores an old sunflower sprite for use by toys.
2015-05-23 19:38:31 +02:00
GinjaNinja32
3fb3a18f05
Supply shuttle and crate fixes
...
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
Atlantis
97f0470504
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-22 21:01:26 +02:00
PsiOmega
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
Zuhayr
3377f8bbf1
Merge pull request #9407 from GinjaNinja32/floorpainter
...
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 18:43:00 +09:30
GinjaNinja32
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
Chinsky
a1d84ff176
Merge pull request #9385 from GinjaNinja32/structure_climb
...
Fixes structure climbing
2015-05-21 03:58:13 +03:00
Chinsky
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
GinjaNinja32
c345f317ac
Fixes structure climbing
2015-05-20 17:10:18 +01:00
GinjaNinja32
aeb8f2a6c2
Fixes #9380
2015-05-20 16:44:47 +01:00
Zuhayr
71da36ec01
Updated force vars on bats.
2015-05-21 00:52:17 +09:30
Zuhayr
a6f59edc22
Bit of documentation.
2015-05-20 14:00:14 +09:30
mwerezak
c289975498
Adds attack animation calls for a few common machines and structures
...
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
mwerezak
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
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
PsiOmegaDelta
ce8188c1a2
Merge pull request #9350 from Hubblenaut/lockers
...
Fixes overbloated closets
2015-05-18 19:16:59 +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
