Commit Graph

2182 Commits

Author SHA1 Message Date
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
Zuhayr
066772b1ce Fixes #5879 2014-09-01 22:45:37 +09:30
PsiOmega
9e4b7ed265 Preliminary support for the new general information. Renames the exploit record to permanent record.
The new general information being:
Home system
Citizenship
Faction
Religion

Still to be made available in employment/security/medical records as applicable.
2014-09-01 14:45:47 +02:00
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
JimTheCactus
b54a3056c7 Improved PDA power monitor for clarity
The PowerON cart will now display the area that the power monitor is located to make it clear that you're looking at the power monitor, not the actual power net. This comes up when multiple power monitors have the same name.
2014-09-01 01:32:30 -06:00
JimTheCactus
aeea0b0bd6 PDAs now behave properly with unconnected power monitors
Resolves an issue where the PDA would throw a runtime and a client side error when attempting to communicate with a power monitor that wasn't connected to a power net.
2014-09-01 01:27:54 -06:00
Whitellama
9cd42a3f33 Changes candle.dm procs to absolute paths 2014-08-31 19:48:34 -07:00
PsiOmega
dccec4483d Syndicate agents can now view exploitable information from their syndicate uplink display. 2014-09-01 01:12:03 +02:00
Whitellama
d536f7d56a Fixed police tape not going in tactical combat belts 2014-08-31 15:34:21 -07:00
Whitellama
f5c9586153 Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer. 2014-08-31 02:12:04 -07:00
PsiOmega
bad2f92e1c Mobs now requires 15 units of storage in a locker to fit. Allows two mobs in a single typical locker. 2014-08-30 18:06:21 +02:00
Ccomp5950
f6b2fbd32d Merge pull request #6210 from comma/nochatter
Sending PDA messages and talking in radio things now triggers autoaim.
2014-08-29 22:44:04 -05:00
Ccomp5950
48f7f08d64 Merge pull request #6209 from comma/ironscan
Health analyzer now shows is limb is not meat.
2014-08-29 22:43:37 -05:00
Ccomp5950
68f2833a3b Merge pull request #6208 from comma/forcesay
Ported forcesay from TG
2014-08-29 22:43:20 -05:00
Chinsky
4ceb7dbd55 Merge pull request #6215 from PsiOmegaDelta/SyndiPDA
Syndicate Uplink - string to datum
2014-08-29 15:42:38 +04:00
Chinsky
54297a6865 Ported forcesay from TG
Stun batons and brute attacks have a chance to interrupt whatever guy was saying and send out incomplete version of whatever he had in chatbar.
Credit to Petethegoat.
2014-08-29 15:25:57 +04:00
PsiOmega
7e74ae82f5 Updates the Syndicate uplink to use a more robust datum system, rather than the old way of parsing a giant string. 2014-08-29 12:48:12 +02:00
Whitellama
aa0ab32a9c Egg boxes and donut boxes can be constructed from cardboard 2014-08-28 18:27:51 -07:00
Chinsky
552d4ed6eb Health analyzer now shows is limb is not meat. 2014-08-29 04:13:12 +04:00
Chinsky
4cc2bd4e3d Sending PDA messages and talking in radio things now triggers autoaim.
With PDA messages it also gives visible message, for baddies without autoaim-capable guns to consider.
2014-08-29 04:12:14 +04:00
Walter0o
c0b6f82ad0 emergency HTML/JS injection fix MK2, the underping.
fixes a minor oversight in proc order after i shuffled them around.
2014-08-27 15:42:59 +02:00