Commit Graph

11504 Commits

Author SHA1 Message Date
PsiOmega
228000d9cc Marks the engine room, AI, and asteroid shuttle APCs as critical. 2015-05-26 13:26:42 +02:00
Chinsky
bae5bf8b4a Monkeys are scoopable again. 2015-05-26 13:44:01 +03:00
PsiOmegaDelta
2b749602c7 Merge pull request #9475 from Zuhayr/paiscoop
Allows pAIs to be scooped up and worn as hats.
2015-05-26 12:39:05 +02:00
PsiOmega
bcb1ea5413 Endgame tweaks.
Now instead calls the proper round-end proc when finishing the round, allowing admins to interrupt restart if desired.
None of the current end game variants currently use over/underlays, they are now content with coloring space.
On endgame start, the entire world is now updated in a spawn() instead, reducing crippling lag.
Adds support to designate APCs are critical, these are not drained during world end events.
Fixes a couple of potential runtime errors if no escape points have bee mapped in.
People in wheelchairs and mechas can now enter the world end rift.
Cult walls no longer cultify over and over, indefinitely.
2015-05-26 12:29:50 +02:00
Kelenius
f7814e2394 Fixes #9473
Also: removes automatic shuttle calls when callers are destroyed;
Applies qdel;
Fixes teleporter control console design that probably didn't work
before.
2015-05-26 09:58:25 +03:00
PsiOmega
62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-26 08:35:32 +02:00
Zuhayr
0104de03d4 Allows pAIs to be scooped up and worn as hats.
Readds missing monkey inhands
Standardized get_scooped() calls to mousedrop instead of attack_hand.
Changelog.
2015-05-26 15:15:15 +09:30
Zuhayr
1b4b428fe9 Removed several unneeded icons from inhands, split holder icons into their own file. 2015-05-26 14:05:21 +09:30
Zuhayr
7ab8a380bd Addendum to custom synth icon commit. 2015-05-26 14:04:51 +09:30
StarSmasher
711ad88903 Fixes #9294
Adding 6 tomato juice to 50 protein doesn't really work if the maximum is 50.
Also fixed it in the vegetable pizzas.

Figured a quickfix would be better than a very delayed fix.
2015-05-25 22:26:55 +02:00
PsiOmegaDelta
ccf5945944 Merge pull request #9362 from Kelenius/ofResearchAndPrototypes
Updates to science
2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb Merge pull request #9293 from RavingManiac/dev
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm
2015-05-25 20:35:46 +03:00
PsiOmegaDelta
b934258adc Merge pull request #9458 from Zuhayr/ipc
Fixes IPC lack of frailty.
2015-05-25 09:43:20 +02:00
Zuhayr
76c3fecf9a Fixes IPC lack of frailty. 2015-05-25 17:07:04 +09:30
Zuhayr
f32a8493c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into posibrains 2015-05-25 16:50:04 +09:30
Zuhayr
88b3019e6c Adds ghost click to posibrains.
Added ghost trap system used by plants and posibrains to get players. Added attack_ghost() to hydro trays and posibrains for the aforementioned.
Changelog.
Minor typo.
Topic fixes.
Minor fix.
2015-05-25 16:49:22 +09:30
Zuhayr
d6e3df5fba Attempting to guarantee immunity to viruses for virus_immune var. 2015-05-25 15:52:51 +09:30
Zuhayr
74dfd82072 Organ cleanup, stat to DEAD, world removal 2015-05-25 14:50:02 +09:30
Zuhayr
7dd86c9147 Readded preview icon for IPC, added language and blurb.
Added welder/fuel checks to relevant surgery.
2015-05-25 14:50:00 +09:30
Zuhayr
f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general.
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
2015-05-25 14:49:57 +09:30
Zuhayr
aa97778f0a Fixes #9433 2015-05-25 14:49:07 +09:30
Zuhayr
958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
2015-05-25 14:49:07 +09:30
Zuhayr
3cae318716 Merge pull request #9370 from comma/frankenstein
Frankenstein
2015-05-25 13:56:40 +09:30
Atlantis
2f74a6d3c2 Telecommunications Solar Arrays
- Makes telecommunications solars actually work. They are connected into ring-shaped cable running around whole telecomms, powering single SMES unit which in turn powers the satellite itself.
- Installed solars have maximal combined output of 240kW. Real output fluctuates between 120kW and 160kW depending on star orientation.
- Fractal generator and relevant breaker removed. RCON control is still possible, by adjusting SMES settings.
2015-05-25 06:18:10 +02: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
Zuhayr
161af35d6c Merge pull request #9416 from Hubblenaut/dev
Makes mice pick up-able
2015-05-25 02:25:37 +09:30
Chinsky
b01c3a4ba9 Merge pull request #9451 from PsiOmegaDelta/Tmp
Fixes #9447.
2015-05-24 18:16:08 +03:00
Chinsky
7835afc361 Merge pull request #9450 from mwerezak/workboots
Adds engineering workboots
2015-05-24 18:16:00 +03:00
Hubblenaut
7a8bbab694 fixup 2015-05-24 15:39:43 +02:00
PsiOmegaDelta
3d9aa48f49 Merge pull request #9442 from GinjaNinja32/shuttle
Supply shuttle and crate fixes
2015-05-24 14:43:15 +02: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
mwerezak
b4c88c6186 Adds engineering workboots
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04:00
Atlantis
c2c3a2c689 Implements remaining suggestions
- Few more grammar fixes
- Machine overload adjustment finished. SMESs and APCs now receive explosion intensity bonus according to stored charge.
- Gets rid of remains of old "src:" references in AI Life() proc
2015-05-24 03:05:27 +02:00
Atlantis
ef040583c8 Implements github suggestions
Among others:
- TXT helpfile is now HTML helpfile
- Lots of gremmer changes
- Some adjustments
2015-05-23 22:22:38 +02:00
GinjaNinja32
4bad50e875 Gives AI/borg previews back their cardborg hats 2015-05-23 20:42:51 +01: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
Kelenius
5be2bd6a1b Updates to properly DA materials 2015-05-23 15:21:11 +03:00
Zuhayr
5b8bf58d0d Merge pull request #9439 from Baystation12/dev-freeze
Dev-freeze into dev.
2015-05-23 21:40:26 +09:30
Zuhayr
50dd6aa0bb Merge with master. 2015-05-23 21:29:40 +09:30
Zuhayr
d4e45fbee8 Merge pull request #9327 from Techhead0/chemRenames
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
2015-05-23 20:52:58 +09:30
Zuhayr
cd86cad68c Merge pull request #8816 from atlantiscze/nanocrusade-two
Nano Crusade 2
2015-05-23 20:44:28 +09:30
Zuhayr
a2571b95c3 Merge pull request #9418 from mwerezak/port-gen
Fixes portable generators going above their temperature limit
2015-05-23 20:40:07 +09:30
mwerezak
b72abc8b64 Chem reaction cleanup
Reorganizes handle_reactions() in preparation for implementing
reactions-over-time.
Moves chemistry initializations into global_init.
2015-05-22 19:45:31 -04:00
mwerezak
fef7c5ca6c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sm-eject
Conflicts:
	code/modules/mob/living/living.dm
2015-05-22 19:38:04 -04:00
Hubblenaut
7564dcf843 Fixes merge conflict 2015-05-22 21:36:48 +02:00
Atlantis
97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
Hubblenaut
a7ad448293 mice are pickup-able 2015-05-22 17:59:06 +02:00
PsiOmega
15756f031b Fixes pulse-check text. 2015-05-22 14:00:42 +02:00