Commit Graph

2052 Commits

Author SHA1 Message Date
Mloc-Argent
4871a3a850 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/ATMOSPHERICS/pipes.dm
	icons/atmos/pipes.dmi
2014-10-15 22:13:44 +01:00
PsiOmega
68f4f1809e AI PDA tapping fix
An AI should no longer tap on a non-existing screen with its non-existing fingers while writing PDA messages.
2014-10-15 17:38:54 +02:00
Menshin
70b2c9a1fa Who thought it was a good idea to omit multiplier for 1x ?!? 2014-10-14 22:48:48 +02:00
Menshin
6387c96bb5 Ambiguous expression readded. 2014-10-14 22:31:19 +02:00
Menshin
eb707ea9b6 Prevent stacks multiplier href exploit 2014-10-14 18:34:53 +02:00
Zuhayr
37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr
df038c9fe8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-06 20:15:59 +10:30
Zuhayr
d0b3a3a39b Merge pull request #6601 from Mloc/bs12-calert
donut boxes now update their icon to properly reflect their contents
2014-10-06 19:37:24 +10:30
Mloc
9faec14707 donut boxes now update their icon to properly reflect their contents
Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-05 19:24:30 +01:00
RavingManiac
756e9ae030 Zooming with an item is now done with a general proc zoom(). This applies to binoculars and sniper rifle. 2014-10-04 17:38:38 +08:00
RavingManiac
2aab019cba Binoculars zoom no longer a right-click menu option. Already supplanted by attack_self(). 2014-10-04 04:05:26 +08:00
RavingManiac
f0da0380a5 Sniper rifle zoom now adds a client.pixel_x/y offset in addition to zoom. Currently 11 tiles in the direction the user is facing. Zooming can now be done through the right-click menu.
Binoculars added. Functionally similar to sniper scope. Adminspawn-only as of this commit.
2014-10-04 04:01:56 +08:00
Zuhayr
e283fa850f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-10-03 06:58:53 +09:30
PsiOmega
fd060cc5fe Fixes #6546
Replaces iffy cartridge type checks with access checks.
2014-10-02 09:29:04 +02:00
Zuhayr
6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Zuhayr
305416d5c5 Merg resolution. 2014-10-02 02:33:06 +09:30
Mloc
dbff924849 fixes #6562
fixes #6571

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 17:48:17 +01:00
Mloc
6a91020529 fixes #6540
Signed-off-by: Mloc <colmohici@gmail.com>
2014-09-30 20:13:03 +01:00
Zuhayr
e2ce1fa2df Collapsed Bump() down to carbon from alien and monkey. Stripped out extraneous stuff from carbon/alien HUD. Implemented some life stuff for aliens. 2014-09-30 15:28:30 +09:30
Zuhayr
b4646b65e8 Fixed up organ transplant rejection, added cortical stacks, changed vox over to use organ stacks. 2014-09-30 14:09:41 +09:30
Zuhayr
803c5c557e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-29 06:21:49 +09:30
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
Atlantiscze
19864ff3fe world << removal
- Removes world << which was triggered by robotic reset modules.
2014-09-21 04:09:01 +02:00
Chinsky
c529e014a7 Merge pull request #6462 from PsiOmegaDelta/Ion
AI restoration console shows ion laws
2014-09-20 21:20:33 +04:00
PsiOmega
03a293d226 AI restoration console shows ion laws
AI restoration console now displays ion laws just as the intelliCard does.
Fixes a minor problem with the intelliCard not adding newlines after ion laws.
2014-09-20 10:42:41 +02:00
Atlantiscze
e7297c90db Cyborg Radio Change
- Cyborgs can now toggle if they want their radio to broadcast to everyone around them. Starts ON by default.
2014-09-18 19:34:38 +02:00
PsiOmega
fe126626ac Cleans up radio frequency numbers.
Replaces magic numbers across the code base with proper constants.
Prepares for the ability to have more than one antag channel in the future.
Corrects a lie.
2014-09-18 13:07:34 +02:00
Atlantiscze
ded8e21c0f Cyborg Power Usage Overhaul
- Adds new standardised proc for power usage as Cyborg
- Each component now uses different amount of power. Some components use "idle" power (camera), which means constant load. Other components use "active" power, which is single-time burst load.. Example: Actuator.
- Power usage is directly proportional to work done. Moving cyborg uses more power than still cyborg.
- Information in Status tab changed. Now it only shows percentage of remaining charge, as well as cell rating and cell load (W)
2014-09-17 07:31:20 +02:00
DJSnapshot
e6b5681db0 Rest of the fixes for custom borgs on module reset. 2014-09-14 06:22:46 -07:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
mwerezak
716c6ab3ef APC cell_type is now an actual power cell type 2014-09-10 22:12:43 -04:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
SparklySheep
fda0070273 Update candle.dm 2014-09-06 15:06:55 -05:00
SparklySheep
81b7327bbb Increases how long the candle lasts.
Candle should last about ten times longer making it more useful as a light source.
2014-09-06 15:05:09 -05:00
Chinsky
91daf249ff Merge pull request #6278 from PsiOmegaDelta/StopRunningInTheShower
Wet shower floors
2014-09-06 05:43:17 +04:00
PsiOmega
264504c595 Showers now cause wet floors. Mops can now be used to clean shuttles (non-simulated floor). 2014-09-04 16:36:26 +02:00
PsiOmega
4b4c2d11fa Beepsky and ED209 are now closer friends than ever, now actually sharing code instead of each having gone and bought their own.
There is potential for breaking out all the special stuff for laser code but for now I'm happy to simply have a shared codebase.
I imagine pathfinding/patrolling may be sharable with bots in general as well.
2014-09-04 12:38:51 +02:00
PsiOmega
e4bffb2d76 Limits body/cryo bags to a single mob. 2014-09-03 10:43:04 +02:00
Zuhayr
67cb6e297e Merge pull request #6254 from Kelenius/OfStacks
Of Stacks
2014-09-02 17:58:28 +09:30
Chinsky
367ddf6848 Merge pull request #6242 from PsiOmegaDelta/ExploitableAlternative
Antags - Exploitable Information - MKII
2014-09-02 11:18:50 +04:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
PsiOmega
b7d356c4ab The Syndicate uplink now only access the locked records, meaning it will be unaware of later in-round changes concerning a given character. 2014-09-02 07:12:13 +02:00
Whitellama
71c2317264 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
Conflicts:
	code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
aedb3725f2 Fixes #5874 2014-09-01 23:20:27 +09:30